svn commit: r791666 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung
Date: Tue Jul 7 01:15:25 2009
New Revision: 791666
URL: http://svn.apache.org/viewvc?rev=791666view=rev
Log:
Vote.
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=791666r1=791665r2=791666view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 7 01:15:25 2009
@@ -137,30 +137,30 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
Strip {MD5} as well as {SHA} from digested passwords
http://svn.apache.org/viewvc?rev=790405view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, rjung
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47149
Explicitly specify encoding for the source files
http://people.apache.org/~kkolinko/patches/2009-07-04_tc6_encodings.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Add *.rtf to the list of exclusions in fixcrlf task.
http://svn.apache.org/viewvc?rev=791184view=rev
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Remove build-webapps-precompile target from dist.xml
Discussion: http://markmail.org/thread/ymgbgqm3lav6rnjh
Patch:
http://people.apache.org/~kkolinko/patches/2009-07-04_tc6_remove-webapps-precompile.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Specify explicit encoding when performing replace task
http://svn.apache.org/viewvc?rev=791194view=rev
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
@@ -174,18 +174,18 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38897
Add uri of broken TLD to error message to help debugging
http://svn.apache.org/viewvc?rev=791243view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, rjung
-1:
* Various script improvements (free free to vote for them individually)
http://svn.apache.org/viewvc?rev=791326view=rev (remove JSSE)
http://svn.apache.org/viewvc?rev=791328view=rev (display classpath)
http://svn.apache.org/viewvc?rev=791331view=rev (align platforms / bug
39194)
- +1: markt
+ +1: markt, rjung (all 3 patches)
-1:
-
+
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478
https://svn.apache.org/viewcvs.cgi?view=revrev=791524
- +1: fhanik
+ +1: fhanik, rjung
-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
svn commit: r791670 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung
Date: Tue Jul 7 01:41:55 2009
New Revision: 791670
URL: http://svn.apache.org/viewvc?rev=791670view=rev
Log:
Vote.
Modified:
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791670r1=791669r2=791670view=diff
==
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul 7 01:41:55 2009
@@ -55,7 +55,7 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
Strip {MD5} as well as {SHA} from digested passwords
http://svn.apache.org/viewvc?rev=790405view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, rjung
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38743
@@ -68,7 +68,7 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47149
Explicitly specify encoding for the source files
http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_encodings.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Document minimum required Ant version to be 1.6.2, instead of 1.5.x
@@ -77,7 +77,7 @@
(Though it is a docs patch, I think it is an important change)
Patch for BUILDING.txt:
http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_antversion.patch
- +1: kkolinko
+ +1: kkolinko, rjung
+1: markt - min JRE version is 1.4, even with the compat package
-1:
@@ -88,12 +88,12 @@
(We have a License.rtf file)
Note, that fixlast option for fixcrlf task is since Ant 1.6.1 only.
http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_fixcrlf.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Specify explicit encoding when performing filtering in copy and replace tasks
http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_copy-encodings.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47464
@@ -101,8 +101,9 @@
Also, I limited the scope of fixcrlf task in package-src-tgz target
to process the sources dir only.
http://people.apache.org/~kkolinko/patches/2009-07-05_tc55_packsources.patch
- +1: kkolinko, markt
+ +1: kkolinko, markt, rjung
-1:
+ rjung: Not sure, why you exclude bin instead of *.class
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
Reverts previous fix for
@@ -116,12 +117,12 @@
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38897
Add uri of broken TLD to error message to help debugging
http://svn.apache.org/viewvc?rev=791243view=rev
- +1: markt, kkolinko
+ +1: markt, kkolinko, rjung
-1:
* Various script improvements (free free to vote for them individually)
http://svn.apache.org/viewvc?rev=791326view=rev (remove JSSE)
http://svn.apache.org/viewvc?rev=791328view=rev (display classpath)
http://svn.apache.org/viewvc?rev=791331view=rev (align platforms / bug
39194)
- +1: markt
+ +1: markt, rjung (all three patches)
-1:
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791671 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/ha/tcp/ java/org/apache/catalina/tribes/transport/
Author: rjung
Date: Tue Jul 7 01:47:49 2009
New Revision: 791671
URL: http://svn.apache.org/viewvc?rev=791671view=rev
Log:
Remove some obsolete (and partially broken) message strings.
Backport of r789944 from trunk.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings_es.properties
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=791671r1=791670r2=791671view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 7 01:47:49 2009
@@ -129,11 +129,6 @@
+1: markt
-1:
-* Remove some obsolete (and partially broken) message strings.
- http://svn.apache.org/viewvc?rev=789944view=rev
- +1: rjung, kkolinko, markt
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37984
Strip {MD5} as well as {SHA} from digested passwords
http://svn.apache.org/viewvc?rev=790405view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties?rev=791671r1=791670r2=791671view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings.properties
Tue Jul 7 01:47:49 2009
@@ -77,11 +77,3 @@
SimpleTcpCluster.log.receive=RECEIVE {0,date}:{0,time} {1,number}
{2}:{3,number,integer} {4} {5}
SimpleTcpCluster.log.send=SEND {0,date}:{0,time} {1,number}
{2}:{3,number,integer} {4}
SimpleTcpCluster.log.send.all=SEND {0,date}:{0,time} {1,number} - {2}
-SocketReplictionListener.allreadyExists=ServerSocket [{0}:{1}] allready
started!
-SocketReplictionListener.accept.failure=ServerSocket [{0}:{1}] - Exception to
start thread or accept server socket
-SocketReplictionListener.open=Open Socket at [{0}:{1}]
-SocketReplictionListener.openclose.failure=ServerSocket [{0}:{1}] - Exception
to open or close server socket
-SocketReplictionListener.portbusy=Port busy at [{0}:{i}] - reason [{2}]
-SocketReplictionListener.serverSocket.notExists=Fatal error: Receiver socket
not bound address={0} port={1} maxport={2}
-SocketReplictionListener.timeout=Receiver ServerSocket no started [{0}:{1}] -
reason: timeout={2} or listen={3}
-SocketReplictionListener.unlockSocket.failure=UnLocksocket failure at
ServerSocket [{0:{1}]
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties?rev=791671r1=791670r2=791671view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/LocalStrings_es.properties
Tue Jul 7 01:47:49 2009
@@ -77,11 +77,3 @@
SimpleTcpCluster.log.receive = RECEIVE {0,date}\:{0,time} {1,number}
{2}\:{3,number,integer} {4} {5}
SimpleTcpCluster.log.send = SEND {0,date}\:{0,time} {1,number}
{2}\:{3,number,integer} {4}
SimpleTcpCluster.log.send.all = SEND {0,date}\:{0,time} {1,number} - {2}
-SocketReplictionListener.allreadyExists = ServerSocket [{0}\:{1}] allready
started\!
-SocketReplictionListener.accept.failure = ServerSocket [{0}\:{1}] - Exception
to start thread or accept server socket
-SocketReplictionListener.open = Open Socket at [{0}\:{1}]
-SocketReplictionListener.openclose.failure = ServerSocket [{0}\:{1}] -
Exception to open or close server socket
-SocketReplictionListener.portbusy = Port busy at [{0}\:{i}] - reason [{2}]
-SocketReplictionListener.serverSocket.notExists = Fatal error\: Receiver
socket not bound address\={0} port\={1} maxport\={2}
-SocketReplictionListener.timeout = Receiver ServerSocket no started [{0}\:{1}]
- reason\: timeout\={2} or listen\={3}
-SocketReplictionListener.unlockSocket.failure = UnLocksocket failure at
ServerSocket [{0\:{1}]
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties?rev=791671r1=791670r2=791671view=diff
==
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org
svn commit: r791730 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Tue Jul 7 07:23:42 2009 New Revision: 791730 URL: http://svn.apache.org/viewvc?rev=791730view=rev Log: Remove comment. Konstantin explained it on tomcat-dev. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791730r1=791729r2=791730view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul 7 07:23:42 2009 @@ -103,7 +103,6 @@ http://people.apache.org/~kkolinko/patches/2009-07-05_tc55_packsources.patch +1: kkolinko, markt, rjung -1: - rjung: Not sure, why you exclude bin instead of *.class * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797 Reverts previous fix for - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791735 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Tue Jul 7 07:45:35 2009 New Revision: 791735 URL: http://svn.apache.org/viewvc?rev=791735view=rev Log: Add comment. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791735r1=791734r2=791735view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul 7 07:45:35 2009 @@ -139,3 +139,12 @@ We switch between JDK and JRE based on env.variables (e.g. introduced through setenv.[sh|bat]). Why not to add tools.jar always when JDK is used? + rjung: It looks to me like javac as an argument was possible before the patch +(even already in tc4.1) but wasn't actually changing anything except for +additional checks. A _RUNJAVAC was set but never used. +After the patch javac is meant to do something, namely adding tools.jar to +the classpath. The shift seems to be in + http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.sh?r1=791331r2=791330pathrev=791331 +I don't like adding tools.jar whenever a JDK is used. The JDK contains additional +tools relative to the JRE, so I always prefer people to install the JDK even +when they only use the JDT compiler for Tomcat. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r791823 - in /tomcat/sandbox/tomcat-oacc/trunk: RELEASE-NOTES RUNNING.txt
Author: rjung Date: Tue Jul 7 13:13:40 2009 New Revision: 791823 URL: http://svn.apache.org/viewvc?rev=791823view=rev Log: Fix class name syntax in OACC docs. Modified: tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt Modified: tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES?rev=791823r1=791822r2=791823view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES (original) +++ tomcat/sandbox/tomcat-oacc/trunk/RELEASE-NOTES Tue Jul 7 13:13:40 2009 @@ -44,8 +44,8 @@ All cluster configuration options from Tomcat 5.5 should work without any change with OACC. You need to ensure, that you have set the managerClassName explicitely to either -org/apache/catalina/cluster/session/SimpleTcpReplicationManager -or org/apache/catalina/cluster/session/DeltaManager. +org.apache.catalina.cluster.session.SimpleTcpReplicationManager +or org.apache.catalina.cluster.session.DeltaManager. You don't need to uninstall Tomcat 6 default cluster if you like to use OACC. We don't support mixed use of OACC and Tomcat 6 default cluster Modified: tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt?rev=791823r1=791822r2=791823view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt (original) +++ tomcat/sandbox/tomcat-oacc/trunk/RUNNING.txt Tue Jul 7 13:13:40 2009 @@ -70,8 +70,8 @@ work without any change with OACC. You need to ensure, that you have set the managerClassName explicitely to either - org/apache/catalina/cluster/session/SimpleTcpReplicationManager or - org/apache/catalina/cluster/session/DeltaManager. + org.apache.catalina.cluster.session.SimpleTcpReplicationManager or + org.apache.catalina.cluster.session.DeltaManager. You don't need to uninstall Tomcat 6 default cluster if you like to use OACC. We don't support mixed use of OACC and Tomcat 6 default cluster - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r793669 - /tomcat/trunk/bin/setclasspath.bat
Author: rjung Date: Mon Jul 13 19:16:49 2009 New Revision: 793669 URL: http://svn.apache.org/viewvc?rev=793669view=rev Log: Explicitely return value 0 if we return without error from setclasspath.bat. Otherwise errorlevel in catalina.bat is not reset. catalina.bat checks for non-zero errorlevel after the call to setclasspath.bat and then fails silently, because it assumes setclasspath.bat to log any error. If there is an error above the call to setclasspath.bat, catalina.bat fails without any message. Since there is only very basic logic above the call to setclasspath.bat, let us reset errorlevel to ignore errors. Example: any set myvar= for an undefined variable myvar sets errorlevel to 1, although it is a correct statement, setting the variable to an empty value. Modified: tomcat/trunk/bin/setclasspath.bat Modified: tomcat/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/setclasspath.bat?rev=793669r1=793668r2=793669view=diff == --- tomcat/trunk/bin/setclasspath.bat (original) +++ tomcat/trunk/bin/setclasspath.bat Mon Jul 13 19:16:49 2009 @@ -87,3 +87,4 @@ exit /b 1 :end +exit /b 0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r793672 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Jul 13 19:22:13 2009 New Revision: 793672 URL: http://svn.apache.org/viewvc?rev=793672view=rev Log: Vote. 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=793672r1=793671r2=793672view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 13 19:22:13 2009 @@ -115,7 +115,7 @@ * Remove standardSession strings not used by DeltaSession http://svn.apache.org/viewvc?rev=791789view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158 @@ -134,7 +134,7 @@ * Script improvement - alternative patch http://svn.apache.org/viewvc?rev=793372view=rev (align platforms / bug 39194) - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478 @@ -159,5 +159,7 @@ AJP connectors do not handle certificate chains Patch by Patrik Schnellmann https://issues.apache.org/bugzilla/attachment.cgi?id=23951 - +1: markt + +1: markt, rjung -1: + rjung: It seems the line int i = 0; in the patch for + java/org/apache/jk/core/MsgContext.java is not used. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r793674 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Jul 13 19:25:23 2009 New Revision: 793674 URL: http://svn.apache.org/viewvc?rev=793674view=rev Log: Add 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=793674r1=793673r2=793674view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 13 19:25:23 2009 @@ -163,3 +163,9 @@ -1: rjung: It seems the line int i = 0; in the patch for java/org/apache/jk/core/MsgContext.java is not used. + +* Correct errorlevel handling in setclasspath.bat + http://svn.apache.org/viewvc?rev=793669view=rev + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r793677 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Mon Jul 13 19:28:20 2009 New Revision: 793677 URL: http://svn.apache.org/viewvc?rev=793677view=rev Log: Add backport proposal. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=793677r1=793676r2=793677view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Mon Jul 13 19:28:20 2009 @@ -72,4 +72,8 @@ +1: markt -1: - \ No newline at end of file +* Correct errorlevel handling in setclasspath.bat + http://svn.apache.org/viewvc?rev=793669view=rev + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r793680 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Jul 13 19:37:30 2009 New Revision: 793680 URL: http://svn.apache.org/viewvc?rev=793680view=rev Log: Remove wrong comment. Thanks Mark for clarification, I was to stupid to notice the variable use. 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=793680r1=793679r2=793680view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 13 19:37:30 2009 @@ -161,8 +161,6 @@ https://issues.apache.org/bugzilla/attachment.cgi?id=23951 +1: markt, rjung -1: - rjung: It seems the line int i = 0; in the patch for - java/org/apache/jk/core/MsgContext.java is not used. * Correct errorlevel handling in setclasspath.bat http://svn.apache.org/viewvc?rev=793669view=rev - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r793688 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Jul 13 19:57:52 2009 New Revision: 793688 URL: http://svn.apache.org/viewvc?rev=793688view=rev Log: Vote. 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=793688r1=793687r2=793688view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 13 19:57:52 2009 @@ -170,6 +170,6 @@ * Update to Commons Pool 1.5.2 http://svn.apache.org/viewvc?rev=793682view=rev - +1: markt + +1: markt, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r793689 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Mon Jul 13 19:58:37 2009 New Revision: 793689 URL: http://svn.apache.org/viewvc?rev=793689view=rev Log: Vote. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=793689r1=793688r2=793689view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Mon Jul 13 19:58:37 2009 @@ -79,5 +79,5 @@ * Update to Commons Pool 1.5.2 http://svn.apache.org/viewvc?rev=793682view=rev - +1: markt + +1: markt, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r794849 - in /tomcat: container/tc5.5.x/catalina/src/bin/setclasspath.bat current/tc5.5.x/STATUS.txt
Author: rjung Date: Thu Jul 16 20:50:41 2009 New Revision: 794849 URL: http://svn.apache.org/viewvc?rev=794849view=rev Log: Explicitely return value 0 if we return without error from setclasspath.bat. Otherwise errorlevel in catalina.bat is not reset. catalina.bat checks for non-zero errorlevel after the call to setclasspath.bat and then fails silently, because it assumes setclasspath.bat to log any error. If there is an error above the call to setclasspath.bat, catalina.bat fails without any message. Since there is only very basic logic above the call to setclasspath.bat, let us reset errorlevel to ignore errors. Example: any set myvar= for an undefined variable myvar sets errorlevel to 1, although it is a correct statement, setting the variable to an empty value. Backport of r793669 from trunk. Modified: tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat?rev=794849r1=794848r2=794849view=diff == --- tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat (original) +++ tomcat/container/tc5.5.x/catalina/src/bin/setclasspath.bat Thu Jul 16 20:50:41 2009 @@ -67,3 +67,4 @@ exit /b 1 :end +exit /b 0 Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=794849r1=794848r2=794849view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 20:50:41 2009 @@ -90,11 +90,6 @@ +1: markt, kkolinko -1: -* Correct errorlevel handling in setclasspath.bat - http://svn.apache.org/viewvc?rev=793669view=rev - +1: rjung, kkolinko. markt - -1: - * Allow encoding to be specified for JULI FileHandler http://svn.apache.org/viewvc?rev=793882view=rev +1: kkolinko, markt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r794859 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Thu Jul 16 21:11:22 2009 New Revision: 794859 URL: http://svn.apache.org/viewvc?rev=794859view=rev Log: Vote. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=794859r1=794858r2=794859view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Thu Jul 16 21:11:22 2009 @@ -35,14 +35,14 @@ * Script improvement - alternative patch http://svn.apache.org/viewvc?rev=793372view=rev (align platforms / bug 39194) - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: kkolinko: It needs rev.793757 that I am proposing below. Otherwise the user isn't able to set CLASSPATH in setenv script. * Script improvement - additional patch http://svn.apache.org/viewvc?rev=793757view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39231 @@ -56,7 +56,7 @@ AJP connectors do not handle certificate chains Patch by Patrik Schnellmann https://issues.apache.org/bugzilla/attachment.cgi?id=23952 - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: kkolinko: in the lines of RequestHandler.java that are seen in the patch, but are not changed by it there is a bug: certString.getBytes() - it @@ -87,18 +87,18 @@ Port of http://svn.apache.org/viewvc?view=revrevision=637867 Add SSLRandomSeed option to APR to enable faster starts on development systems https://issues.apache.org/bugzilla/attachment.cgi?id=23962 - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Allow encoding to be specified for JULI FileHandler http://svn.apache.org/viewvc?rev=793882view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380 Correct synchronisation of expire(). Method should only run once. http://svn.apache.org/viewvc?rev=793981view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Minor cleanups for AccessLogValve classes @@ -112,5 +112,5 @@ Enable the JvmRouteBinderValve to work with PersistentManagers as well as clusters http://svn.apache.org/viewvc?rev=794822view=rev - +1: markt + +1: markt, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r794864 - in /tomcat/tc6.0.x/trunk: STATUS.txt bin/setclasspath.bat
Author: rjung Date: Thu Jul 16 21:21:35 2009 New Revision: 794864 URL: http://svn.apache.org/viewvc?rev=794864view=rev Log: Explicitely return value 0 if we return without error from setclasspath.bat. Otherwise errorlevel in catalina.bat is not reset. catalina.bat checks for non-zero errorlevel after the call to setclasspath.bat and then fails silently, because it assumes setclasspath.bat to log any error. If there is an error above the call to setclasspath.bat, catalina.bat fails without any message. Since there is only very basic logic above the call to setclasspath.bat, let us reset errorlevel to ignore errors. Example: any set myvar= for an undefined variable myvar sets errorlevel to 1, although it is a correct statement, setting the variable to an empty value. Backport of r793669 from trunk. Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/bin/setclasspath.bat Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=794864r1=794863r2=794864view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 21:21:35 2009 @@ -156,11 +156,6 @@ +1: fhanik -1: -* Correct errorlevel handling in setclasspath.bat - http://svn.apache.org/viewvc?rev=793669view=rev - +1: rjung, kkolinko, markt - -1: - * Allow encoding to be specified for JULI FileHandler http://svn.apache.org/viewvc?rev=793882view=rev +1: kkolinko, markt, rjung Modified: tomcat/tc6.0.x/trunk/bin/setclasspath.bat URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/bin/setclasspath.bat?rev=794864r1=794863r2=794864view=diff == --- tomcat/tc6.0.x/trunk/bin/setclasspath.bat (original) +++ tomcat/tc6.0.x/trunk/bin/setclasspath.bat Thu Jul 16 21:21:35 2009 @@ -88,3 +88,4 @@ exit /b 1 :end +exit /b 0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r794863 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Thu Jul 16 21:19:49 2009 New Revision: 794863 URL: http://svn.apache.org/viewvc?rev=794863view=rev Log: Vote. 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=794863r1=794862r2=794863view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 16 21:19:49 2009 @@ -135,7 +135,7 @@ * Script improvement - additional patch http://svn.apache.org/viewvc?rev=793757view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47478 @@ -163,29 +163,34 @@ * Allow encoding to be specified for JULI FileHandler http://svn.apache.org/viewvc?rev=793882view=rev - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40380 Correct synchronisation of expire(). Method should only run once. http://svn.apache.org/viewvc?rev=793981view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Improve JNDI debug logging for lookups http://svn.apache.org/viewvc?rev=794082view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47444 Remove Jakarta references http://people.apache.org/~markt/patches/2009-07-16-jakarta-part1.patch - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: + rjung: +1 to what kkolinko wrote: + Examples taglib URL is inconsistent. Both the following variants are used: + .../example-taglib and .../examples-taglib + Though this inconsistency already existed before this patch. + * Make constants constant http://svn.apache.org/viewvc?rev=794673view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47515 @@ -197,5 +202,5 @@ Enable the JvmRouteBinderValve to work with PersistentManagers as well as clusters http://svn.apache.org/viewvc?rev=794822view=rev - +1: markt + +1: markt, rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795010 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Fri Jul 17 08:40:49 2009 New Revision: 795010 URL: http://svn.apache.org/viewvc?rev=795010view=rev Log: Vote. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=795010r1=795009r2=795010view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 08:40:49 2009 @@ -121,5 +121,7 @@ architecture. Ported from 6.0 (mainly from Mladen's rev.791699) http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_native_install_791699.patch - +1: kkolinko + +1: kkolinko, rjung -1: + rjung: Please change all occurences of i64 to ia64. AFAIK ia64 is the official notation. + Please only commit for 5.5.28 if you find time to test before Filip tags later today. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795031 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Fri Jul 17 10:24:44 2009 New Revision: 795031 URL: http://svn.apache.org/viewvc?rev=795031view=rev Log: Remove comment clarified by Konstantin. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=795031r1=795030r2=795031view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 10:24:44 2009 @@ -123,5 +123,3 @@ http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_native_install_791699.patch +1: kkolinko, rjung -1: - rjung: Please change all occurences of i64 to ia64. AFAIK ia64 is the official notation. - Please only commit for 5.5.28 if you find time to test before Filip tags later today. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795234 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Fri Jul 17 21:39:59 2009 New Revision: 795234 URL: http://svn.apache.org/viewvc?rev=795234view=rev Log: Vote. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=795234r1=795233r2=795234view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Fri Jul 17 21:39:59 2009 @@ -79,13 +79,13 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 Reduce errors if using ENABLE_CLEAR_REFERENCES=true http://svn.apache.org/viewvc?rev=795152view=rev (less generics) - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47239 Fix Copyright sign in generated Javadoc http://people.apache.org/~kkolinko/patches/2009-07-17_tc55_bug47239_javadoc_copyrightsign.patch - +1: kkolinko + +1: kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46967 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r795235 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Fri Jul 17 21:41:16 2009 New Revision: 795235 URL: http://svn.apache.org/viewvc?rev=795235view=rev Log: Vote. 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=795235r1=795234r2=795235view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jul 17 21:41:16 2009 @@ -159,7 +159,6 @@ .../example-taglib and .../examples-taglib Though this inconsistency already existed before this patch. - * Make constants constant http://svn.apache.org/viewvc?rev=794673view=rev +1: markt, kkolinko, rjung @@ -173,7 +172,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41059 Reduce errors if using ENABLE_CLEAR_REFERENCES=true http://svn.apache.org/viewvc?rev=795152view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41661 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r797425 - in /tomcat/trunk: build.xml dist.xml extras.xml
Author: rjung
Date: Fri Jul 24 12:14:05 2009
New Revision: 797425
URL: http://svn.apache.org/viewvc?rev=797425view=rev
Log:
Correct build.properties.default file name in
more build files and explain more explicit how
the customization files work.
Modified:
tomcat/trunk/build.xml
tomcat/trunk/dist.xml
tomcat/trunk/extras.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=797425r1=797424r2=797425view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Fri Jul 24 12:14:05 2009
@@ -20,8 +20,15 @@
!-- = Initialize Property Values === --
- !-- See build.properties.default in the top level directory for all
--
- !-- property values you must customize for successful building!!!--
+ !-- We read customizable properties from the file
build.properties.default --
+ !-- and also from build.properties if it exists.
--
+ !-- The values in build.properties have stronger preference.
--
+ !-- If you want to customize your build, you can either change the values
--
+ !-- directly in the default file, or create a new build.properties and set
--
+ !-- the values there. This way you don't have to change a file which is
part --
+ !-- of the original project source code.
--
+ !-- See build.properties.default in the top level directory for some
--
+ !-- property values you may customize.
--
property file=${user.home}/build.properties/
property file=build.properties/
Modified: tomcat/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=797425r1=797424r2=797425view=diff
==
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Fri Jul 24 12:14:05 2009
@@ -20,8 +20,15 @@
!-- = Initialize Property Values === --
- !-- See build.properties.sample in the top level directory for all --
- !-- property values you must customize for successful building!!!--
+ !-- We read customizable properties from the file
build.properties.default --
+ !-- and also from build.properties if it exists.
--
+ !-- The values in build.properties have stronger preference.
--
+ !-- If you want to customize your build, you can either change the values
--
+ !-- directly in the default file, or create a new build.properties and set
--
+ !-- the values there. This way you don't have to change a file which is
part --
+ !-- of the original project source code.
--
+ !-- See build.properties.default in the top level directory for some
--
+ !-- property values you may customize.
--
property file=${user.home}/build.properties/
property file=build.properties/
Modified: tomcat/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=797425r1=797424r2=797425view=diff
==
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Fri Jul 24 12:14:05 2009
@@ -20,8 +20,15 @@
!-- = Initialize Property Values === --
- !-- See build.properties.sample in the top level directory for all --
- !-- property values you must customize for successful building!!!--
+ !-- We read customizable properties from the file
build.properties.default --
+ !-- and also from build.properties if it exists.
--
+ !-- The values in build.properties have stronger preference.
--
+ !-- If you want to customize your build, you can either change the values
--
+ !-- directly in the default file, or create a new build.properties and set
--
+ !-- the values there. This way you don't have to change a file which is
part --
+ !-- of the original project source code.
--
+ !-- See build.properties.default in the top level directory for some
--
+ !-- property values you may customize.
--
property file=${user.home}/build.properties/
property file=build.properties/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r797803 - in /tomcat: build/tc5.5.x/resources/ connectors/trunk/jk/native/iis/installer/ connectors/trunk/jk/xdocs/images/ connectors/trunk/jni/native/os/win32/ connectors/trunk/jni/xdocs/
Author: rjung Date: Sat Jul 25 17:25:12 2009 New Revision: 797803 URL: http://svn.apache.org/viewvc?rev=797803view=rev Log: Add thumbnail databases to svn ignore for all tc5.5.x (and related) folders containing images. Modified: tomcat/build/tc5.5.x/resources/ (props changed) tomcat/connectors/trunk/jk/native/iis/installer/ (props changed) tomcat/connectors/trunk/jk/xdocs/images/ (props changed) tomcat/connectors/trunk/jni/native/os/win32/ (props changed) tomcat/connectors/trunk/jni/xdocs/images/ (props changed) tomcat/container/tc5.5.x/modules/groupcom/doc/ (props changed) tomcat/container/tc5.5.x/webapps/ROOT/ (props changed) tomcat/container/tc5.5.x/webapps/admin/images/ (props changed) tomcat/container/tc5.5.x/webapps/docs/appdev/sample/web/images/ (props changed) tomcat/container/tc5.5.x/webapps/docs/images/ (props changed) tomcat/container/tc5.5.x/webapps/webdav/ (props changed) Propchange: tomcat/build/tc5.5.x/resources/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/connectors/trunk/jk/native/iis/installer/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/connectors/trunk/jk/xdocs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/connectors/trunk/jni/native/os/win32/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/connectors/trunk/jni/xdocs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/container/tc5.5.x/modules/groupcom/doc/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/container/tc5.5.x/webapps/ROOT/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/container/tc5.5.x/webapps/admin/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/container/tc5.5.x/webapps/docs/appdev/sample/web/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/container/tc5.5.x/webapps/docs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/container/tc5.5.x/webapps/webdav/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 17:25:12 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r797813 - in /tomcat/archive/tc4.1.x/trunk: connectors/jk/native/iis/installer/ connectors/jk/xdocs/images/ connectors/jni/native/os/win32/ connectors/jni/xdocs/images/ container/catalina/
Author: rjung Date: Sat Jul 25 18:19:53 2009 New Revision: 797813 URL: http://svn.apache.org/viewvc?rev=797813view=rev Log: Add thumbnail databases to svn ignore for all tc4.1.x (and related) folders containing images. Modified: tomcat/archive/tc4.1.x/trunk/connectors/jk/native/iis/installer/ (props changed) tomcat/archive/tc4.1.x/trunk/connectors/jk/xdocs/images/ (props changed) tomcat/archive/tc4.1.x/trunk/connectors/jni/native/os/win32/ (props changed) tomcat/archive/tc4.1.x/trunk/connectors/jni/xdocs/images/ (props changed) tomcat/archive/tc4.1.x/trunk/container/catalina/docs/ (props changed) tomcat/archive/tc4.1.x/trunk/container/catalina/docs/dev/ (props changed) tomcat/archive/tc4.1.x/trunk/container/catalina/docs/dev/xdocs/images/ (props changed) tomcat/archive/tc4.1.x/trunk/container/resources/ (props changed) tomcat/archive/tc4.1.x/trunk/container/webapps/ROOT/ (props changed) tomcat/archive/tc4.1.x/trunk/container/webapps/admin/images/ (props changed) tomcat/archive/tc4.1.x/trunk/container/webapps/examples/images/ (props changed) tomcat/archive/tc4.1.x/trunk/container/webapps/tomcat-docs/appdev/sample/web/images/ (props changed) tomcat/archive/tc4.1.x/trunk/container/webapps/tomcat-docs/images/ (props changed) tomcat/archive/tc4.1.x/trunk/container/webapps/webdav/ (props changed) Propchange: tomcat/archive/tc4.1.x/trunk/connectors/jk/native/iis/installer/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/connectors/jk/xdocs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/connectors/jni/native/os/win32/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/connectors/jni/xdocs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/catalina/docs/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/catalina/docs/dev/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/catalina/docs/dev/xdocs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/resources/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/webapps/ROOT/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/webapps/admin/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/webapps/examples/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/webapps/tomcat-docs/appdev/sample/web/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/webapps/tomcat-docs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/archive/tc4.1.x/trunk/container/webapps/webdav/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:19:53 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db
svn commit: r797815 - in /tomcat: connectors/branches/native/1.1.x/jni/native/os/win32/ tc6.0.x/trunk/java/javax/servlet/jsp/tagext/doc-files/ tc6.0.x/trunk/res/ tc6.0.x/trunk/webapps/ROOT/ tc6.0.x/tr
Author: rjung Date: Sat Jul 25 18:27:32 2009 New Revision: 797815 URL: http://svn.apache.org/viewvc?rev=797815view=rev Log: Add thumbnail databases to svn ignore for all tc6.0.x (and related) folders containing images. Modified: tomcat/connectors/branches/native/1.1.x/jni/native/os/win32/ (props changed) tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/doc-files/ (props changed) tomcat/tc6.0.x/trunk/res/ (props changed) tomcat/tc6.0.x/trunk/webapps/ROOT/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/appdev/sample/web/images/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/images/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/tribes/ (props changed) tomcat/tc6.0.x/trunk/webapps/examples/jsp/images/ (props changed) tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/ (props changed) tomcat/tc6.0.x/trunk/webapps/examples/servlets/images/ (props changed) tomcat/tc6.0.x/trunk/webapps/host-manager/images/ (props changed) tomcat/tc6.0.x/trunk/webapps/manager/images/ (props changed) Propchange: tomcat/connectors/branches/native/1.1.x/jni/native/os/win32/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/doc-files/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/res/ -- --- svn:ignore (original) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -1 +1,3 @@ manifest.tmp +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/ROOT/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/docs/appdev/sample/web/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/docs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/docs/tribes/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/examples/jsp/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/jspx/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/examples/servlets/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/host-manager/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/tc6.0.x/trunk/webapps/manager/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:27:32 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r797818 - in /tomcat/trunk: java/javax/servlet/jsp/tagext/doc-files/ res/ webapps/ROOT/ webapps/docs/appdev/sample/web/images/ webapps/docs/images/ webapps/docs/tribes/ webapps/examples/js
Author: rjung Date: Sat Jul 25 18:34:46 2009 New Revision: 797818 URL: http://svn.apache.org/viewvc?rev=797818view=rev Log: Add thumbnail databases to svn ignore for all trunk (and related) folders containing images. Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/doc-files/ (props changed) tomcat/trunk/res/ (props changed) tomcat/trunk/webapps/ROOT/ (props changed) tomcat/trunk/webapps/docs/appdev/sample/web/images/ (props changed) tomcat/trunk/webapps/docs/images/ (props changed) tomcat/trunk/webapps/docs/tribes/ (props changed) tomcat/trunk/webapps/examples/jsp/images/ (props changed) tomcat/trunk/webapps/examples/jsp/jsp2/jspx/ (props changed) tomcat/trunk/webapps/examples/servlets/images/ (props changed) tomcat/trunk/webapps/host-manager/images/ (props changed) tomcat/trunk/webapps/manager/images/ (props changed) Propchange: tomcat/trunk/java/javax/servlet/jsp/tagext/doc-files/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/res/ -- --- svn:ignore (original) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -1 +1,3 @@ manifest.tmp +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/ROOT/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/docs/appdev/sample/web/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/docs/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/docs/tribes/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/examples/jsp/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/examples/jsp/jsp2/jspx/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/examples/servlets/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/host-manager/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db Propchange: tomcat/trunk/webapps/manager/images/ -- --- svn:ignore (added) +++ svn:ignore Sat Jul 25 18:34:46 2009 @@ -0,0 +1,2 @@ +thumbs.db +Thumbs.db - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r797958 - in /tomcat/connectors/branches/native/1.1.x: STATUS.txt jni/STATUS.txt
Author: rjung Date: Sun Jul 26 17:23:45 2009 New Revision: 797958 URL: http://svn.apache.org/viewvc?rev=797958view=rev Log: Merge the two STATUS files for the tcnative branch. Removed: tomcat/connectors/branches/native/1.1.x/jni/STATUS.txt Modified: tomcat/connectors/branches/native/1.1.x/STATUS.txt Modified: tomcat/connectors/branches/native/1.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/connectors/branches/native/1.1.x/STATUS.txt?rev=797958r1=797957r2=797958view=diff == --- tomcat/connectors/branches/native/1.1.x/STATUS.txt (original) +++ tomcat/connectors/branches/native/1.1.x/STATUS.txt Sun Jul 26 17:23:45 2009 @@ -63,3 +63,11 @@ http://people.apache.org/~rjung/patches/jni.patch +1: rjung -1: + +* Sync native and Java methods. Patch available at + http://people.apache.org/~rjung/patches/tcnative-sync.patch + Partial backport of + http://svn.apache.org/viewvc?view=revrevision=730523 + +1: rjung, mturk + 0: + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r798055 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Mon Jul 27 07:27:20 2009 New Revision: 798055 URL: http://svn.apache.org/viewvc?rev=798055view=rev Log: Oups: copypaste error. 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=798055r1=798054r2=798055view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jul 27 07:27:20 2009 @@ -198,5 +198,5 @@ * Improve build.properties comment in ant build files. Backport from trunk. http://svn.apache.org/viewvc?rev=797425view=rev - +1: markt + +1: rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r798056 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Mon Jul 27 07:29:26 2009 New Revision: 798056 URL: http://svn.apache.org/viewvc?rev=798056view=rev Log: Add proposal. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=798056r1=798055r2=798056view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Mon Jul 27 07:29:26 2009 @@ -102,3 +102,9 @@ http://svn.apache.org/viewvc?rev=797607view=rev +1: markt -1: + +* Improve build.properties comment in ant build files. + Backport from trunk, only the part on build.xml. + http://svn.apache.org/viewvc?rev=797425view=rev + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r798072 - /tomcat/current/tc5.5.x/STATUS.txt
Author: rjung Date: Mon Jul 27 08:09:26 2009 New Revision: 798072 URL: http://svn.apache.org/viewvc?rev=798072view=rev Log: Vote. Modified: tomcat/current/tc5.5.x/STATUS.txt Modified: tomcat/current/tc5.5.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=798072r1=798071r2=798072view=diff == --- tomcat/current/tc5.5.x/STATUS.txt (original) +++ tomcat/current/tc5.5.x/STATUS.txt Mon Jul 27 08:09:26 2009 @@ -73,25 +73,26 @@ Based on a patch by Kirk Wolf Also make behaviour consistent when using a security manager http://svn.apache.org/viewvc?view=revrevision=777567 - +1: kkolinko, markt + +1: kkolinko, markt, rjung -1: + rjung: minus the generics * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41661 Thread safety issue in JspConfig.init() seen in production http://svn.apache.org/viewvc?rev=795210view=rev - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46907 Debug logging should not cause input stream to be swallowed http://svn.apache.org/viewvc?view=revrevision=797168 - +1: markt, kkolinko + +1: markt, kkolinko, rjung -1: * https://issues.apache.org/bugzilla/show_bug.cgi?id=47566 Update to NSIS 2.45 http://svn.apache.org/viewvc?rev=797596view=rev - +1: kkolinko + +1: kkolinko, rjung -1: kkolinko: Now it also requires the following patch, but I hope that sourceforge.net will fix their error: @@ -100,7 +101,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41824 Need to use canonical rather than binary form when writing code http://svn.apache.org/viewvc?rev=797607view=rev - +1: markt + +1: markt, rjung -1: * Improve build.properties comment in ant build files. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r809661 - in /tomcat/tc5.5.x/trunk/container/modules: cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java groupcom/src/share/org/apache/catalina/tribes/membership/Mca
Author: rjung
Date: Mon Aug 31 17:01:44 2009
New Revision: 809661
URL: http://svn.apache.org/viewvc?rev=809661view=rev
Log:
Fix comment - no functional change.
The comment was misleading, because we changed
the value of the flag without correcting the comment.
Modified:
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
Modified:
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java?rev=809661r1=809660r2=809661view=diff
==
---
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
Mon Aug 31 17:01:44 2009
@@ -183,7 +183,14 @@
} else {
socket = new MulticastSocket(port);
}
-socket.setLoopbackMode(false); //hint that we don't need loop back
messages
+
+/**
+ * The argument of setLoopbackMode() is named disable.
+ * We set it to false, because we need loopback messages for the case
+ * when multiple cluster nodes reside on the same machine.
+ */
+socket.setLoopbackMode(false);
+
if (mcastBindAddress != null) {
if(log.isInfoEnabled())
log.info(Setting multihome multicast interface to: +
Modified:
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=809661r1=809660r2=809661view=diff
==
---
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
Mon Aug 31 17:01:44 2009
@@ -179,7 +179,14 @@
} else {
socket = new MulticastSocket(port);
}
-socket.setLoopbackMode(false); //hint that we don't need loop back
messages
+
+/**
+ * The argument of setLoopbackMode() is named disable.
+ * We set it to false, because we need loopback messages for the case
+ * when multiple cluster nodes reside on the same machine.
+ */
+socket.setLoopbackMode(false);
+
if (mcastBindAddress != null) {
if(log.isInfoEnabled())
log.info(Setting multihome multicast interface to:
+mcastBindAddress);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r810161 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Tue Sep 1 18:40:32 2009 New Revision: 810161 URL: http://svn.apache.org/viewvc?rev=810161view=rev Log: Vote. 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=810161r1=810160r2=810161view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 1 18:40:32 2009 @@ -174,7 +174,7 @@ * Fix NPE observed when unpackWARs=false with above fix http://svn.apache.org/viewvc?view=revrevision=805153 - +1: markt, funkman + +1: markt, funkman, rjung -1: * Port Active Directory improvements to JNDIREalm from trunk @@ -237,14 +237,17 @@ * Expose filter configuration via JMX (read-only) Based on a patch by Xie Xiaodong as part of GSOC2009. http://svn.apache.org/viewvc?rev=802727view=rev - +1: markt, funkman + +1: markt, funkman, rjung -1: + rjung: typo regsiter - register should be corrected everywhere (method name, + log messages etc., string manager property, sometimes with capitalzation Regsiter) + Another little style nitpick: if( - if (. * Use platform MBean server rather than creating a new one. Makes it possible to connect JConsole and other JMX tools to locally running Tomcat instances without any config changes to Tomcat http://svn.apache.org/viewvc?rev=677910view=rev - +1: markt, funkman + +1: markt, funkman, rjung -1: * Add remote JMX listener. Enables JMX to be configured so that it can be used @@ -252,8 +255,12 @@ uses one fixed and one random port. Needs the platform MBean server fix above to be really useful http://people.apache.org/~markt/patches/2009-08-12-jmx-remote.patch - +1: markt, funkman + +1: markt, funkman, rjung -1: + rjung: The docs page contains a typo: rmiRegsitryPortPlatform - rmiRegistryPortPlatform + There are also some hidden defaults (password and access file) which might make + sense to be added to the docs. Directory for those default files is + CATALINA_BASE and not CATALINA_BASE/conf? * Make context deployment error message more meaningful http://svn.apache.org/viewvc?rev=802940view=rev @@ -264,7 +271,7 @@ https://issues.apache.org/bugzilla/show_bug.cgi?id=47046 Clean up Jk components that only exist in the 6.0.x and were hence missed https://issues.apache.org/bugzilla/attachment.cgi?id=24125 - +1: markt, funkman + +1: markt, funkman, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45403 @@ -318,7 +325,7 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47705 ArithmeticException: / by zero when expiring sessions via manager http://svn.apache.org/viewvc?rev=809603view=rev - +1: funkman + +1: funkman, rjung -1: @@ -339,7 +346,5 @@ } } - +1: fhanik + +1: fhanik, rjung -1: - - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r810164 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Tue Sep 1 18:44:26 2009 New Revision: 810164 URL: http://svn.apache.org/viewvc?rev=810164view=rev Log: Vote Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=810164r1=810163r2=810164view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Sep 1 18:44:26 2009 @@ -87,7 +87,7 @@ * Fix a couple of Java 1.5 uses that should be 1.4 compatible http://people.apache.org/~markt/patches/2009-08-12-tc5.5.x-java14.patch - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r810176 - in /tomcat/tc5.5.x/trunk: STATUS.txt build/build.xml build/resources/build.xml
Author: rjung
Date: Tue Sep 1 19:07:21 2009
New Revision: 810176
URL: http://svn.apache.org/viewvc?rev=810176view=rev
Log:
Fix build.xml comment. Backport from trunk.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/build.xml
tomcat/tc5.5.x/trunk/build/resources/build.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=810176r1=810175r2=810176view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Sep 1 19:07:21 2009
@@ -67,24 +67,6 @@
+1: kkolinko
-1:
-* Improve build.properties comment in ant build files.
- Backport from trunk, only the part on build.xml.
- http://svn.apache.org/viewvc?rev=797425view=rev
- +1: rjung, kkolinko
- -1:
- kkolinko: (
-1. Comments are documentation, thus CTR is fine for them.
-2. The phrase See build.properties.default in the top level directory
-is a bit wrong here: here it is in the build directory, not in the top
-level one.
-
-3. There are two other files besides build/build.xml in 5.5:
- a) build/resources/build.xml that is copied
- the top level directory of sources archive at build time. See *-src.zip
- file from a release.
- b) webapps/docs/build.xml It is mentioned in the docs (in building.html).
- )
-
* Fix a couple of Java 1.5 uses that should be 1.4 compatible
http://people.apache.org/~markt/patches/2009-08-12-tc5.5.x-java14.patch
+1: markt, rjung
Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=810176r1=810175r2=810176view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Tue Sep 1 19:07:21 2009
@@ -20,8 +20,15 @@
!-- = Initialize Property Values === --
- !-- See build.properties.sample in the top level directory for all --
- !-- property values you must customize for successful building!!!--
+ !-- We read customizable properties from the file
build.properties.default --
+ !-- and also from build.properties if it exists.
--
+ !-- The values in build.properties have stronger preference.
--
+ !-- If you want to customize your build, you can either change the values
--
+ !-- directly in the default file, or create a new build.properties and set
--
+ !-- the values there. This way you don't have to change a file which is
part --
+ !-- of the original project source code.
--
+ !-- See build.properties.default in the build directory for some
--
+ !-- property values you may customize.
--
property file=${user.home}/build.properties/
property file=build.properties/
Modified: tomcat/tc5.5.x/trunk/build/resources/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/resources/build.xml?rev=810176r1=810175r2=810176view=diff
==
--- tomcat/tc5.5.x/trunk/build/resources/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/resources/build.xml Tue Sep 1 19:07:21 2009
@@ -21,8 +21,15 @@
!-- = Initialize Property Values === --
- !-- See build.properties.sample in the top level directory for all --
- !-- property values you must customize for successful building!!!--
+ !-- We read customizable properties from the file
build.properties.default --
+ !-- and also from build.properties if it exists.
--
+ !-- The values in build.properties have stronger preference.
--
+ !-- If you want to customize your build, you can either change the values
--
+ !-- directly in the default file, or create a new build.properties and set
--
+ !-- the values there. This way you don't have to change a file which is
part --
+ !-- of the original project source code.
--
+ !-- See build.properties.default in the build directory for some
--
+ !-- property values you may customize.
--
property file=${user.home}/build.properties/
property file=build.properties/
property file=build.properties.default/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r810193 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Tue Sep 1 19:44:20 2009 New Revision: 810193 URL: http://svn.apache.org/viewvc?rev=810193view=rev Log: Change vote. 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=810193r1=810192r2=810193view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Sep 1 19:44:20 2009 @@ -346,5 +346,6 @@ } } - +1: fhanik, rjung + +1: fhanik -1: + rjung: Note discussion at http://marc.info/?t=12518257461r=1w=2 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812278 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Mon Sep 7 21:20:25 2009 New Revision: 812278 URL: http://svn.apache.org/viewvc?rev=812278view=rev Log: Add proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=812278r1=812277r2=812278view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Sep 7 21:20:25 2009 @@ -93,3 +93,12 @@ http://svn.apache.org/viewvc?rev=809131view=rev +1: markt -1: + +* Fix cluster replication problem: session expiration uses a replication + shortcut, so that attributes changed immediately before invalidation do + not get replicated before the expiration replication message. + That's a problem in case a session listener needs the changed attribute. + Patch: http://people.apache.org/~rjung/patches/TC5.5-cluster-replicate-before-expire.patch + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812415 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Author: rjung
Date: Tue Sep 8 09:35:14 2009
New Revision: 812415
URL: http://svn.apache.org/viewvc?rev=812415view=rev
Log:
Port r769428 from TC5.5.x resp. r750895 from TC 6.0.x.
Backport: Handle session suffix rewrite at JvmRouteBinderValve with parallel
requests from same client.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=812415r1=812414r2=812415view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Sep 8 09:35:14 2009
@@ -33,6 +33,11 @@
subsection name=Cluster
changelog
fix
+Handle situation session ID rewriting on fail-over with parallel
requests
+from the same client.
+Port from Tomcat 5.5. (rjung)
+ /fix
+ fix
bug46717/bug: Hard to reproduce thread safety issue with
session expiration.
Port from Tomcat 5.5. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=812415r1=812414r2=812415view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Tue Sep 8 09:35:14 2009
@@ -35,6 +35,7 @@
import org.apache.catalina.cluster.ClusterManager;
import org.apache.catalina.cluster.ClusterMessage;
import org.apache.catalina.cluster.ClusterValve;
+import org.apache.catalina.cluster.session.DeltaSession;
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.session.ManagerBase;
@@ -219,8 +220,8 @@
* @param response current response
*/
protected void handlePossibleTurnover(Request request, Response response) {
-Session session = request.getSessionInternal(false);
-if (session != null) {
+String sessionID = request.getRequestedSessionId() ;
+if (sessionID != null) {
long t1 = 0 ;
if (log.isDebugEnabled()) {
t1 = System.currentTimeMillis();
@@ -231,7 +232,7 @@
log.warn(sm.getString(jvmRoute.missingJvmRouteAttribute));
return;
}
-handleJvmRoute( request, response,session.getIdInternal(),
jvmRoute);
+handleJvmRoute( request, response, sessionID, jvmRoute);
if (log.isDebugEnabled()) {
long t2 = System.currentTimeMillis();
long time = t2 - t1;
@@ -311,23 +312,32 @@
log.debug(sm.getString(jvmRoute.failover, requestJvmRoute,
localJvmRoute, sessionId));
}
-// OK - turnover the session ?
-String newSessionID = sessionId.substring(0, index) + .
-+ localJvmRoute;
Session catalinaSession = null;
try {
catalinaSession = getManager(request).findSession(sessionId);
} catch (IOException e) {
// Hups!
}
+String id = sessionId.substring(0, index);
+String newSessionID = id + . + localJvmRoute;
+// OK - turnover the session and inform other cluster nodes
if (catalinaSession != null) {
changeSessionID(request, response, sessionId, newSessionID,
catalinaSession);
numberOfSessions++;
} else {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString(jvmRoute.cannotFindSession,
-sessionId));
+try {
+catalinaSession =
getManager(request).findSession(newSessionID);
+} catch (IOException e) {
+// Hups!
+}
+if (catalinaSession != null) {
+// session is rewrite at other request, rewrite this also
+changeRequestSessionID(request, response, sessionId,
newSessionID);
+} else {
+if (log.isDebugEnabled()) {
+
log.debug(sm.getString(jvmRoute.cannotFindSession,sessionId));
+}
}
}
}
@@ -349,10 +359,34 @@
Response response, String sessionId, String
svn commit: r812416 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
Author: rjung Date: Tue Sep 8 09:40:03 2009 New Revision: 812416 URL: http://svn.apache.org/viewvc?rev=812416view=rev Log: Backport of r792872 from TC5.5.x Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39603 Admin app fails when used in a cluster Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=812416r1=812415r2=812416view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Sep 8 09:40:03 2009 @@ -33,6 +33,11 @@ subsection name=Cluster changelog fix +bug39603/bug: Admin app only showed ROOT web application when +clustering was enabled. +Port from Tomcat 5.5. (rjung) + /fix + fix Handle situation session ID rewriting on fail-over with parallel requests from the same client. Port from Tomcat 5.5. (rjung) Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml?rev=812416r1=812415r2=812416view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml Tue Sep 8 09:40:03 2009 @@ -1236,6 +1236,10 @@ domain=Catalina group=Valve type=org.apache.catalina.cluster.tcp.ReplicationValve +attribute name=className + description=Fully qualified class name of the managed object + type=java.lang.String +writeable=false/ attribute name=info description=Class version info type=java.lang.String - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812418 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina: authenticator/SingleSignOnEntry.java cluster/session/ReplicationStream.java cluster/tcp/PooledSocketSender.jav
Author: rjung
Date: Tue Sep 8 09:46:50 2009
New Revision: 812418
URL: http://svn.apache.org/viewvc?rev=812418view=rev
Log:
Fix JavaDoc warnings
Backport of r795018 from TC5.5.x and some more.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java?rev=812418r1=812417r2=812418view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/authenticator/SingleSignOnEntry.java
Tue Sep 8 09:46:50 2009
@@ -118,8 +118,7 @@
/**
* Is codeSession/code associated with this SSO?
*
- * @param sso The codeSingleSignOn/code valve that is managing
- * the SSO session.
+ * @param session The codeSession/code to check
* @return session exists
*/
public synchronized boolean sessionExists(Session session) {
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java?rev=812418r1=812417r2=812418view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/ReplicationStream.java
Tue Sep 8 09:46:50 2009
@@ -47,7 +47,7 @@
* Construct a new instance of CustomObjectInputStream
*
* @param stream The input stream we will read from
- * @param classLoader The class loader used to instantiate objects
+ * @param classLoaders The class loaders used to instantiate objects
*
* @exception IOException if an input/output error occurs
*/
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java?rev=812418r1=812417r2=812418view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/PooledSocketSender.java
Tue Sep 8 09:46:50 2009
@@ -108,7 +108,6 @@
/**
* send message and use a pool of SocketSenders
*
- * @param messageId Message unique identifier
* @param data Message data
* @throws java.io.IOException
*/
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java?rev=812418r1=812417r2=812418view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/ReplicationValve.java
Tue Sep 8 09:46:50 2009
@@ -528,7 +528,7 @@
/**
* Send message delta message from request session
-* @param request current request
+* @param session current session
* @param manager session manager
* @param cluster replication cluster
*/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812422 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Author: rjung
Date: Tue Sep 8 09:49:19 2009
New Revision: 812422
URL: http://svn.apache.org/viewvc?rev=812422view=rev
Log:
Rewrite (reword) the Javadoc comment for JvmRouteBinderValve class.
Backport of r796592 from TC5.5.x and r795458 from TC6.0.x.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=812422r1=812421r2=812422view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Tue Sep 8 09:49:19 2009
@@ -45,41 +45,52 @@
/**
* Valve to handle Tomcat jvmRoute takeover using mod_jk module after node
- * failure. After a node crashed the next request going to other cluster node.
- * Now the answering from apache is slower ( make some error handshaking. Very
- * bad with apache at my windows.). We rewrite now the jsessionid
- * information to the backup cluster node. After the next response all client
- * request goes direct to the backup node. The change sessionid send also to
all
- * other cluster nodes. Well, now the session stickyness work directly to the
- * backup node and traffic don't go back too restarted cluster nodes!
- * As jsessionid was created by cookie, the change JSESSIONID cookie resend
with next response.
- *
- * At all cluster node you must configure the as ClusterListener since 5.5.10
- * {...@link
org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener
JvmRouteSessionIDBinderListener}
- * or before with
- *
org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListenerLifecycle.
+ * failure. After a node crashes, subsequent requests go to other cluster
nodes.
+ * That incurs a drop in performance. When this Valve is enabled on a backup
+ * node and sees a request, which was intended for another (thus failed) node,
+ * it will rewrite the cookie jsessionid information to use the route to this
+ * backup cluster node, that answered the request. After the response is
+ * delivered to the client, all subsequent client requests will go directly to
+ * the backup node. The change of sessionid is also sent to all other cluster
+ * nodes. After all that, the session stickyness will work directly to the
+ * backup node and the traffic will not go back to the failed node after it is
+ * restarted!
*
+ * p
+ * For this valve to function correctly, so that all nodes of the cluster
+ * receive the sessionid change notifications that it generates, the following
+ * ClusterListener MUST be configured at all nodes of the cluster:
+ * {...@link
org.apache.catalina.cluster.session.JvmRouteSessionIDBinderListener
+ * JvmRouteSessionIDBinderListener} since Tomcat 5.5.10, and both
+ * JvmRouteSessionIDBinderListener and JvmRouteSessionIDBinderLifecycleListener
+ * for earlier versions of Tomcat.
+ *
+ * p
* Add this Valve to your host definition at conf/server.xml .
*
* Since 5.5.10 as direct cluster valve:br/
+ *
* pre
* lt;Clustergt;
* lt;Valve
className=quot;org.apache.catalina.cluster.session.JvmRouteBinderValvequot;
/gt;
* lt;/Clustergt;
* /pre
+ *
* br /
* Before 5.5.10 as Host element:br/
+ *
* pre
- * lt;Hostrgt;
+ * lt;Hostgt;
* lt;Valve
className=quot;org.apache.catalina.cluster.session.JvmRouteBinderValvequot;
/gt;
- * lt;/Hostrgt;
+ * lt;/Hostgt;
* /pre
*
- * Trick:br/
- * You can enable this mod_jk turnover mode via JMX before you drop a node to
all backup nodes!
- * Set enable true on all JvmRouteBinderValve backups, disable worker at
mod_jk
- * and then drop node and restart it! Then enable mod_jk Worker and disable
JvmRouteBinderValves again.
- * This use case means that only requested session are migrated.
+ * emA Trick:/embr/
+ * You can enable this mod_jk turnover mode via JMX before you drop a node to
+ * all backup nodes! Set enable true on all JvmRouteBinderValve backups,
disable
+ * worker at mod_jk and then drop node and restart it! Then enable mod_jk
worker
+ * and disable JvmRouteBinderValves again. This use case means that only
+ * requested sessions are migrated.
*
* @author Peter Rossbach
* @author Rainer Jung
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812427 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/DeltaManager.java src/share/org/apache/catalina/cluster/session/DeltaSessio
Author: rjung
Date: Tue Sep 8 10:11:45 2009
New Revision: 812427
URL: http://svn.apache.org/viewvc?rev=812427view=rev
Log:
DeltaManager needs to replicate changed attributes even if session
gets invalidated. Otherwise session listeners will not see the right
data on the secondary nodes.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=812427r1=812426r2=812427view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Sep 8 10:11:45 2009
@@ -33,6 +33,11 @@
subsection name=Cluster
changelog
fix
+DeltaManager needs to replicate changed attributes even if session
+gets invalidated. Otherwise session listeners will not see the right
+data on the secondary nodes. (rjung)
+ /fix
+ fix
bug39603/bug: Admin app only showed ROOT web application when
clustering was enabled.
Port from Tomcat 5.5. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=812427r1=812426r2=812427view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaManager.java
Tue Sep 8 10:11:45 2009
@@ -1309,6 +1309,25 @@
* @return a SessionMessage to be sent,
*/
public ClusterMessage requestCompleted(String sessionId) {
+return requestCompleted(sessionId, false);
+}
+
+/**
+ * When the request has been completed, the replication valve will notify
+ * the manager, and the manager will decide whether any replication is
+ * needed or not. If there is a need for replication, the manager will
+ * create a session message and that will be replicated. The cluster
+ * determines where it gets sent.
+ *
+ * Session expiration also calls this method, but with expires == true.
+ *
+ * @param sessionId -
+ *the sessionId that just completed.
+ * @param expires -
+ *whether this method has been called during session expiration
+ * @return a SessionMessage to be sent,
+ */
+public ClusterMessage requestCompleted(String sessionId, boolean expires) {
try {
DeltaSession session = (DeltaSession) findSession(sessionId);
DeltaRequest deltaRequest = session.getDeltaRequest();
@@ -1326,7 +1345,7 @@
}
}
if(!isDeltaRequest) {
-if(!session.isPrimarySession()) {
+if(!expires !session.isPrimarySession()) {
counterSend_EVT_SESSION_ACCESSED++;
msg = new SessionMessageImpl(getName(),
SessionMessage.EVT_SESSION_ACCESSED, null,
sessionId,
@@ -1344,9 +1363,10 @@
getName(), sessionId));
}
}
-session.setPrimarySession(true);
+if (!expires)
+session.setPrimarySession(true);
//check to see if we need to send out an access message
-if ((msg == null)) {
+if (!expires (msg == null)) {
long replDelta = System.currentTimeMillis()
- session.getLastTimeReplicated();
if (replDelta = updateActiveInterval*1000 ||
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java?rev=812427r1=812426r2=812427view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSession.java
Tue Sep 8 10:11:45 2009
@@ -49,7 +49,9 @@
import org.apache.catalina.Session;
import org.apache.catalina.SessionEvent;
import org.apache.catalina.SessionListener;
+import org.apache.catalina.cluster.CatalinaCluster;
import org.apache.catalina.cluster.ClusterSession;
+import
svn commit: r812431 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Tue Sep 8 10:14:11 2009 New Revision: 812431 URL: http://svn.apache.org/viewvc?rev=812431view=rev Log: Update proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=812431r1=812430r2=812431view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Sep 8 10:14:11 2009 @@ -99,6 +99,7 @@ not get replicated before the expiration replication message. That's a problem in case a session listener needs the changed attribute. Patch: http://people.apache.org/~rjung/patches/TC5.5-cluster-replicate-before-expire.patch + This has already been applied to OACC: http://svn.apache.org/viewvc?rev=812427view=rev +1: rjung, pero -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812446 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/changelog.xml src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java src/share/org/apache/catalina/cluster/session/Loca
Author: rjung
Date: Tue Sep 8 10:38:38 2009
New Revision: 812446
URL: http://svn.apache.org/viewvc?rev=812446view=rev
Log:
Port r795052 from TC5.5.x ha
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551
Enable the JvmRouteBinderValve to work with PersistentManagers as well as
clusters
Patch by Chris Chandler
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=812446r1=812445r2=812446view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Tue Sep 8 10:38:38 2009
@@ -33,6 +33,11 @@
subsection name=Cluster
changelog
fix
+bug40551/bug: Enable the JvmRouteBinderValve to work with
+PersistentManagers as well as clustering. Patch by Chris Chandler.
+Port from Tomcat 5.5. (rjung)
+ /fix
+ fix
DeltaManager needs to replicate changed attributes even if session
gets invalidated. Otherwise session listeners will not see the right
data on the secondary nodes. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java?rev=812446r1=812445r2=812446view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
Tue Sep 8 10:38:38 2009
@@ -39,6 +39,7 @@
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.session.ManagerBase;
+import org.apache.catalina.session.PersistentManager;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
import org.apache.catalina.valves.ValveBase;
@@ -209,14 +210,18 @@
ServletException {
if (getEnabled()
- getCluster() != null
request.getContext() != null
request.getContext().getDistributable() ) {
// valve cluster can access manager - other cluster handle
turnover
// at host level - hopefully!
Manager manager = request.getContext().getManager();
- if (manager != null manager instanceof ClusterManager
-
getCluster().getManager(((ClusterManager)manager).getName()) != null)
+
+ if (manager != null (
+ (manager instanceof ClusterManager
+getCluster() != null
+
getCluster().getManager(((ClusterManager)manager).getName()) != null)
+ ||
+ (manager instanceof PersistentManager)))
handlePossibleTurnover(request, response);
}
// Pass this request on to the next valve in our pipeline
@@ -377,9 +382,13 @@
if (catalinaSession instanceof DeltaSession)
((DeltaSession) catalinaSession).resetDeltaRequest();
changeRequestSessionID(request, response, sessionId, newSessionID);
-// now sending the change to all other clusternode!
-ClusterManager manager = (ClusterManager)catalinaSession.getManager();
-sendSessionIDClusterBackup(manager,request,sessionId, newSessionID);
+
+if (getCluster() != null) {
+// now sending the change to all other clusternode!
+ClusterManager manager =
(ClusterManager)catalinaSession.getManager();
+sendSessionIDClusterBackup(manager,request,sessionId,
newSessionID);
+}
+
lifecycle.fireLifecycleEvent(After session migration,
catalinaSession);
if (log.isDebugEnabled()) {
log.debug(sm.getString(jvmRoute.changeSession, sessionId,
@@ -549,13 +558,12 @@
}
}
}
-if (cluster == null) {
-throw new RuntimeException(No clustering support at container
-+ container.getName());
-}
-if (log.isInfoEnabled())
+if (log.isInfoEnabled()) {
log.info(sm.getString(jvmRoute.valve.started));
+if (cluster == null)
+log.info(sm.getString(jvmRoute.noCluster));
+}
}
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org
svn commit: r812469 - in /tomcat/sandbox/tomcat-oacc/trunk: build.xml docs/build.xml
Author: rjung
Date: Tue Sep 8 11:34:35 2009
New Revision: 812469
URL: http://svn.apache.org/viewvc?rev=812469view=rev
Log:
Port r791810 from TC5.5.x.
Specify explicit encoding when performing filtering in copy and replace tasks.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/build.xml
tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml
Modified: tomcat/sandbox/tomcat-oacc/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/build.xml?rev=812469r1=812468r2=812469view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/build.xml Tue Sep 8 11:34:35 2009
@@ -256,7 +256,8 @@
filter token=VERSION value=${version}/
copy file=RELEASE-NOTES
todir=${final.dir}
- filtering=true/
+ filtering=true
+ encoding=ISO-8859-1/
chmod dir=${oacc.release} includes=** perm=oug+rX type=both/
/target
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml?rev=812469r1=812468r2=812469view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/build.xml Tue Sep 8 11:34:35 2009
@@ -50,7 +50,9 @@
!-- Top Level Static Files --
filter token=VERSION value=${version}/
-copy todir=${docs.build}/${docs.dir} filtering=true
+copy todir=${docs.build}/${docs.dir}
+ filtering=true
+ encoding=ISO-8859-1
fileset dir=..
include name=RELEASE-NOTES/
include name=RUNNING.txt/
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812531 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Author: rjung
Date: Tue Sep 8 14:38:22 2009
New Revision: 812531
URL: http://svn.apache.org/viewvc?rev=812531view=rev
Log:
Comment cleanup.
Partial backport of r453771 from tc6.0.x.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java?rev=812531r1=812530r2=812531view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
Tue Sep 8 14:38:22 2009
@@ -268,7 +268,6 @@
getName()+] is not distributable. Ignoring message);
return null;
}
-//notify javagroups
try
{
if ( invalidatedSessions.get(sessionId) != null ) {
@@ -452,7 +451,6 @@
public void start() throws LifecycleException {
mManagerRunning = true;
super.start();
-//start the javagroups channel
try {
//the channel is already running
if ( mChannelStarted ) return;
@@ -517,15 +515,10 @@
mManagerRunning = false;
mChannelStarted = false;
super.stop();
-//stop the javagroup channel
try
{
this.sessions.clear();
cluster.removeManager(getName(),this);
-//mReplicationListener.stopListening();
-//mReplicationTransmitter.stop();
-//service.stop();
-//service = null;
}
catch ( Exception x )
{
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812520 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: mbeans-descriptors.xml tcp/mbeans-descriptors.xml
Author: rjung Date: Tue Sep 8 14:17:32 2009 New Revision: 812520 URL: http://svn.apache.org/viewvc?rev=812520view=rev Log: Merge/move top level mbean descriptors for tcp components to the tcp mbean descriptors file. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mbeans-descriptors.xml tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mbeans-descriptors.xml?rev=812520r1=812519r2=812520view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mbeans-descriptors.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/mbeans-descriptors.xml Tue Sep 8 14:17:32 2009 @@ -17,94 +17,4 @@ -- mbeans-descriptors - mbean name=SimpleTcpCluster -className=org.apache.catalina.mbeans.ClassNameMBean - description=Tcp Cluster implementation - domain=Catalina -group=Cluster - type=org.apache.catalina.cluster.tcp.SimpleTcpCluster - -attribute name=protocolStack - description=JavaGroups protocol stack selection - type=java.lang.String/ - - /mbean - - - mbean name=SimpleTcpReplicationManager -className=org.apache.catalina.mbeans.ClassNameMBean - description=Clustered implementation of the Manager interface - domain=Catalina -group=Manager - type=org.apache.catalina.cluster.tcp.SimpleTcpReplicationManager - -attribute name=algorithm - description=The message digest algorithm to be used when generating - session identifiers - type=java.lang.String/ - -attribute name=checkInterval - description=The interval (in seconds) between checks for expired - sessions - type=int/ - -attribute name=className - description=Fully qualified class name of the managed object - type=java.lang.String -writeable=false/ - -attribute name=distributable - description=The distributable flag for Sessions created by this - Manager - type=boolean/ - -attribute name=entropy - description=A String initialization parameter used to increase the - entropy of the initialization of our random number - generator - type=java.lang.String/ - -attribute name=managedResource - description=The managed resource this MBean is associated with - type=java.lang.Object/ - -attribute name=maxActiveSessions - description=The maximum number of active Sessions allowed, or -1 - for no limit - type=int/ - -attribute name=maxInactiveInterval - description=The default maximum inactive interval for Sessions - created by this Manager - type=int/ - -attribute name=name - description=The descriptive name of this Manager implementation - (for logging) - type=java.lang.String -writeable=false/ - - /mbean - - - -mbean name=ReplicationValve -className=org.apache.catalina.mbeans.ClassNameMBean - description=Valve for simple tcp replication - domain=Catalina -group=Valve - type=org.apache.catalina.cluster.tcp.ReplicationValve - -attribute name=className - description=Fully qualified class name of the managed object - type=java.lang.String -writeable=false/ - -attribute name=debug - description=The debugging detail level for this component - type=int/ - - /mbean - - /mbeans-descriptors Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml?rev=812520r1=812519r2=812520view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml Tue Sep 8 14:17:32 2009 @@ -102,6 +102,61 @@ /mbean + mbean name=SimpleTcpReplicationManager +className=org.apache.catalina.mbeans.ClassNameMBean
svn commit: r812517 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: package.html session/SimpleTcpReplicationManager.java
Author: rjung Date: Tue Sep 8 14:10:20 2009 New Revision: 812517 URL: http://svn.apache.org/viewvc?rev=812517view=rev Log: Remove references to JavaGroups. We never used it in TC 5.x or OACC. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/package.html tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/package.html URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/package.html?rev=812517r1=812516r2=812517view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/package.html (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/package.html Tue Sep 8 14:10:20 2009 @@ -20,8 +20,4 @@ of a Cluster is codeorg.apache.catalina.Cluster/code implementations of this class is done when implementing a new Cluster protocol/p -pThe only Cluster protocol currently implemented is a JavaGroups basedbr -nbsp;nbsp;nbsp;nbsp;bJGCluster.java/b -/p - /body Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java?rev=812517r1=812516r2=812517view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java Tue Sep 8 14:10:20 2009 @@ -44,18 +44,14 @@ * Company: www.filip.net * @author a href=mailto:m...@filip.net;Filip Hanik/a * @author Bela Ban (modifications for synchronous replication) - * @author Rainer Jung * @version 1.0 for TC 4.0 - * Description: The InMemoryReplicationManager is a session manager that replicated - * session information in memory. It uses a href=www.javagroups.comJavaGroups/a as - * a communication protocol to ensure guaranteed and ordered message delivery. - * JavaGroups also provides a very flexible protocol stack to ensure that the replication - * can be used in any environment. + * Description: The SimpleTcpReplicationManager is a session manager that replicated + * session information in memory. * BRBR - * The InMemoryReplicationManager extends the StandardManager hence it allows for us + * The SimpleTcpReplicationManager extends the StandardManager hence it allows for us * to inherit all the basic session management features like expiration, session listeners etc * BRBR - * To communicate with other nodes in the cluster, the InMemoryReplicationManager sends out 7 different type of multicast messages + * To communicate with other nodes in the cluster, the SimpleTcpReplicationManager sends out 7 different type of multicast messages * all defined in the SessionMessage class.BR * When a session is replicated (not an attribute added/removed) the session is serialized into * a byte array using the StandardSession.readObjectData, StandardSession.writeObjectData methods. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812847 - in /tomcat/sandbox/tomcat-oacc/trunk: docs/ src/share/org/apache/catalina/cluster/session/
Author: rjung
Date: Wed Sep 9 09:10:11 2009
New Revision: 812847
URL: http://svn.apache.org/viewvc?rev=812847view=rev
Log:
Backport r610930 from tc6.0.x:
Include user principal if possible when serializing de-serializing sessions.
Fix bug 43840.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings_es.properties
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=812847r1=812846r2=812847view=diff
==
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Wed Sep 9 09:10:11 2009
@@ -33,6 +33,11 @@
subsection name=Cluster
changelog
fix
+bug43840/bug: Include user principal if possible when serializing /
+de-serializing sessions.
+Port from Tomcat 6.0. (rjung)
+ /fix
+ fix
bug40551/bug: Enable the JvmRouteBinderValve to work with
PersistentManagers as well as clustering. Patch by Chris Chandler.
Port from Tomcat 5.5. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings.properties?rev=812847r1=812846r2=812847view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
Wed Sep 9 09:10:11 2009
@@ -91,3 +91,4 @@
standardSession.removeAttribute.ise=removeAttribute: Session already
invalidated
standardSession.sessionEvent=Session event listener threw exception
standardSession.setAttribute.namenull=setAttribute: name parameter cannot be
null
+serializablePrincipal.readPrincipal.cnfe=readPrincipal: Failed to recreate
user Principal
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings_es.properties?rev=812847r1=812846r2=812847view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings_es.properties
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings_es.properties
Wed Sep 9 09:10:11 2009
@@ -90,3 +90,4 @@
standardSession.removeAttribute.ise = removeAttribute\: Sesi\u00F3n ya
invalidada
standardSession.sessionEvent = El oyente de evento de sesi\u00F3n lanz\u00F3
excepci\u00F3n
standardSession.setAttribute.namenull = setAttribute\: par\u00E1metro de
nombre no puede ser nulo
+serializablePrincipal.readPrincipal.cnfe = readPrincipal\: No pude volver a
crea el usuario Principal
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java?rev=812847r1=812846r2=812847view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
Wed Sep 9 09:10:11 2009
@@ -23,11 +23,13 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
+import java.security.Principal;
import java.util.Arrays;
import java.util.List;
import org.apache.catalina.Realm;
import org.apache.catalina.realm.GenericPrincipal;
+import org.apache.catalina.util.StringManager;
/**
@@ -40,6 +42,14 @@
*/
public class SerializablePrincipal implements Serializable {
+protected static org.apache.juli.logging.Log log =
+org.apache.juli.logging.LogFactory.getLog(SerializablePrincipal.class);
+
+/**
+ * The string manager for this package.
+ */
+protected static StringManager sm =
+StringManager.getManager(Constants.Package);
// --- Constructors
@@ -75,6 +85,23 @@
*/
public
svn commit: r812861 - in /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster: authenticator/ deploy/ session/
Author: rjung
Date: Wed Sep 9 09:50:13 2009
New Revision: 812861
URL: http://svn.apache.org/viewvc?rev=812861view=rev
Log:
Introduce base class for cluster messages and make
all cluster message classes extending the base class.
Backport from TC6.0.x.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/FileMessage.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/UndeployMessage.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteBinderValve.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/LocalStrings_es.properties
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionIDMessage.java
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java?rev=812861r1=812860r2=812861view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/authenticator/SingleSignOnMessage.java
Wed Sep 9 09:50:13 2009
@@ -20,6 +20,7 @@
import java.io.Serializable;
import org.apache.catalina.cluster.ClusterMessage;
+import org.apache.catalina.cluster.ClusterMessageBase;
import org.apache.catalina.cluster.Member;
/**
@@ -28,7 +29,7 @@
* @author Fabien Carrion
*/
-public class SingleSignOnMessage implements ClusterMessage, Serializable {
+public class SingleSignOnMessage extends ClusterMessageBase implements
ClusterMessage, Serializable {
public static final int ADD_SESSION = 1;
@@ -56,16 +57,6 @@
private String username = null;
-private Member address = null;
-
-private long timestamp = 0;
-
-private String uniqueId = null;
-
-private int resend = ClusterMessage.FLAG_DEFAULT;
-
-private int compress = ClusterMessage.FLAG_DEFAULT;
-
public SingleSignOnMessage(Member source, String ssoId, String sessionId) {
this.address = source;
this.ssoId = ssoId;
@@ -73,60 +64,21 @@
}
/**
- * Get the address that this message originated from. This would be set if
- * the message was being relayed from a host other than the one that
- * originally sent it.
- */
-public Member getAddress() {
-return address;
-}
-
-/**
- * Called by the cluster before sending it to the other nodes.
- *
- * @param member
- *Member
- */
-public void setAddress(Member member) {
-this.address = member;
-}
-
-/**
- * Timestamp message.
- *
- * @return long
- */
-public long getTimestamp() {
-return timestamp;
-}
-
-/**
- * Called by the cluster before sending out the message.
- *
- * @param timestamp
- *The timestamp
- */
-public void setTimestamp(long timestamp) {
-this.timestamp = timestamp;
-}
-
-/**
* Each message must have a unique ID, in case of using async replication,
* and a smart queue, this id is used to replace messages not yet sent.
*
* @return String
*/
public String getUniqueId() {
-if (this.uniqueId != null)
-return this.uniqueId;
+String uniqueId = super.getUniqueId();
+if (uniqueId != null)
+return uniqueId;
StringBuffer result = new StringBuffer(getSsoId());
result.append(#-#);
result.append(System.currentTimeMillis());
-return result.toString();
-}
-
-public void setUniqueId(String uniqueId) {
-this.uniqueId = uniqueId;
+uniqueId = result.toString();
+setUniqueId(uniqueId);
+return uniqueId;
}
public int getAction() {
@@ -185,40 +137,6 @@
this.username = username;
}
-/**
- * @return Returns the compress.
- * @since 5.5.10
- */
-public int getCompress() {
-return compress;
-}
-
-/**
- * @param compress
- *The compress to set.
- * @since 5.5.10
- */
-public void setCompress(int compress) {
-this.compress = compress;
-}
-
-/**
- * @return Returns
svn commit: r812862 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSessionFacade.java
Author: rjung Date: Wed Sep 9 09:53:54 2009 New Revision: 812862 URL: http://svn.apache.org/viewvc?rev=812862view=rev Log: The facade is gone with the latest change to DeltaSession. Removed: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/DeltaSessionFacade.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812864 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
Author: rjung
Date: Wed Sep 9 09:57:28 2009
New Revision: 812864
URL: http://svn.apache.org/viewvc?rev=812864view=rev
Log:
Remove obsoletet import and add toString() form tc6.0.x.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java?rev=812864r1=812863r2=812864view=diff
==
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/SessionMessageImpl.java
Wed Sep 9 09:57:28 2009
@@ -18,7 +18,6 @@
import org.apache.catalina.cluster.ClusterMessageBase;
-import org.apache.catalina.cluster.Member;
/**
* Session cluster message
@@ -146,4 +145,7 @@
return mContextName;
}
+public String toString() {
+return getEventTypeString() + # + getContextName() + # +
getSessionID() ;
+}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r812865 - /tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java
Author: rjung Date: Wed Sep 9 09:59:56 2009 New Revision: 812865 URL: http://svn.apache.org/viewvc?rev=812865view=rev Log: No functional change. keep in sync with tc 6. Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java Modified: tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java URL: http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java?rev=812865r1=812864r2=812865view=diff == --- tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java (original) +++ tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/session/JvmRouteSessionIDBinderListener.java Wed Sep 9 09:59:56 2009 @@ -147,6 +147,7 @@ } else if (log.isErrorEnabled()) log.error(sm.getString(jvmRoute.hostNotFound, sessionmsg.getContextPath())); } +return; } /** - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r813137 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Wed Sep 9 22:01:27 2009 New Revision: 813137 URL: http://svn.apache.org/viewvc?rev=813137view=rev Log: Add proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=813137r1=813136r2=813137view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Sep 9 22:01:27 2009 @@ -116,3 +116,13 @@ http://svn.apache.org/viewvc?rev=813001view=rev +1: markt -1: + +* Spurious startup errors in the cluster + Although the secondary node is able to retrieve all sessions, + the main thread doesn't see the changed stateTransfered flag, + and thus waits until the transfer timeout occurs. + Observed on Solaris. Switching to volatile fixes it. + Patch: http://people.apache.org/~rjung/patches/cluster-volatile.patch + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r814024 - /tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Author: rjung Date: Fri Sep 11 20:51:00 2009 New Revision: 814024 URL: http://svn.apache.org/viewvc?rev=814024view=rev Log: Switch to volatile for status flag used by multiple threads during cluster context startup. Without volatile problems have been observed, where the change by one thread was actually not seen by the other thread. Performance implications are neglectable, because the variable is only used during context startup. Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=814024r1=814023r2=814024view=diff == --- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Fri Sep 11 20:51:00 2009 @@ -112,7 +112,7 @@ private boolean expireSessionsOnShutdown = false; private boolean notifyListenersOnReplication = true; private boolean notifySessionListenersOnReplication = true; -private boolean stateTransfered = false ; +private volatile boolean stateTransfered = false ; private int stateTransferTimeout = 60; private boolean sendAllSessions = true; private boolean sendClusterDomainOnly = true ; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r814031 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Fri Sep 11 21:07:55 2009 New Revision: 814031 URL: http://svn.apache.org/viewvc?rev=814031view=rev Log: Add a few easy votes, some comments and one 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=814031r1=814030r2=814031view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Sep 11 21:07:55 2009 @@ -235,39 +235,58 @@ * Allow per instance log4j.properties, JAR files (JDBC drivers) etc http://svn.apache.org/viewvc?rev=810916view=rev http://svn.apache.org/viewvc?rev=810977view=rev - +1: markt + +1: markt, rjung -1: + * Allow per instance configuration of JULI or log4j for core Tomcat logging This requires the classpath change above http://svn.apache.org/viewvc?rev=810976view=rev - +1: markt + +1: markt, rjung -1: + rjung: I think you have to switch HOME and BASE in the following changed + lines in logging.xml: ++ If you have multiple instances of Tomcat, each with a separate ++ code$CATALINA_HOME/code but a shared code$CATALINA_BASE/code then * Make the JDBC leak prevention code work with a security manager http://svn.apache.org/viewvc?rev=812432view=rev - +1: markt + +1: markt, rjung -1: * Add additional permission required by JULI http://svn.apache.org/viewvc?rev=813001view=rev - +1: markt + +1: markt, rjung -1: + rjung: Since the above patches now prepare for using juli optionally out of + CATALINA_BASE, shouldn't we also add that location as a codeBase? * Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45785 for extension validator http://svn.apache.org/viewvc?rev=813013view=rev Based on a patch by Rolf Wojtech - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47824 Correct Maven deps http://svn.apache.org/viewvc?rev=813866view=rev - +1: markt + +1: markt, rjung -1: * Update packaging to use per JAR LICENSE, NOTICE and manifest files http://svn.apache.org/viewvc?rev=813936view=rev - +1: markt + +1: markt, rjung -1: + +* Spurious startup errors in the cluster observed for TC 5.5. + Although the secondary node is able to retrieve all sessions, + the main thread doesn't see the changed stateTransfered flag, + and thus waits until the transfer timeout occurs. + Observed on Solaris. Switching to volatile fixes it. + Performance implications are neglectable, because the + variable is only used during context startup. + Backport from trunk: http://svn.apache.org/viewvc?rev=814024view=rev + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r814034 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Fri Sep 11 21:16:01 2009 New Revision: 814034 URL: http://svn.apache.org/viewvc?rev=814034view=rev Log: Update proposal. Modified: tomcat/tc5.5.x/trunk/STATUS.txt Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=814034r1=814033r2=814034view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Sep 11 21:16:01 2009 @@ -122,7 +122,8 @@ the main thread doesn't see the changed stateTransfered flag, and thus waits until the transfer timeout occurs. Observed on Solaris. Switching to volatile fixes it. - Patch: http://people.apache.org/~rjung/patches/cluster-volatile.patch + Backport from trunk: http://svn.apache.org/viewvc?rev=814024view=rev + Need to patch both copies of DeltaManager (ha and cluster). +1: rjung -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r814550 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung
Date: Mon Sep 14 10:00:30 2009
New Revision: 814550
URL: http://svn.apache.org/viewvc?rev=814550view=rev
Log:
Vote and comment.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=814550r1=814549r2=814550view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Sep 14 10:00:30 2009
@@ -114,8 +114,9 @@
* Add additional permission required by JULI
http://svn.apache.org/viewvc?rev=813001view=rev
- +1: markt
+ +1: markt, rjung
-1:
+ rjung: Should we also add ${catalina.base}/bin/tomcat-juli.jar as a codeBase?
* Spurious startup errors in the cluster
Although the secondary node is able to retrieve all sessions,
@@ -131,5 +132,8 @@
Correct synchronisation problem that leads to cluster members permanently
disappearing
https://issues.apache.org/bugzilla/attachment.cgi?id=24253
- +1: markt
+ +1: markt, rjung
-1:
+ rjung: the same fix seems to be necessary for
+
container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
+ (plus another use of the mutex also in receive() around
membership.removeMember(m).
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815726 - /tomcat/native/branches/1.1.x/STATUS.txt
Author: rjung Date: Wed Sep 16 11:19:51 2009 New Revision: 815726 URL: http://svn.apache.org/viewvc?rev=815726view=rev Log: Recover tcnative STATUS file removed during svn reorg. See also http://marc.info/?t=12480793816r=1w=2 Added: tomcat/native/branches/1.1.x/STATUS.txt - copied unchanged from r802220, tomcat/connectors/branches/native/1.1.x/STATUS.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815740 - in /tomcat/native/branches/1.1.x: STATUS.txt native/os/win32/libtcnative.rc
Author: rjung Date: Wed Sep 16 12:43:58 2009 New Revision: 815740 URL: http://svn.apache.org/viewvc?rev=815740view=rev Log: Fix typo VERISON - VERSION Modified: tomcat/native/branches/1.1.x/STATUS.txt tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Modified: tomcat/native/branches/1.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815740r1=815739r2=815740view=diff == --- tomcat/native/branches/1.1.x/STATUS.txt (original) +++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 12:43:58 2009 @@ -37,12 +37,6 @@ -1: * Fix typo. - http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/os/win32/libtcnative.rc?r1=714101r2=714100 - http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/jnirelease.sh?r1=714101r2=714100 - +1: rjung - -1: - -* Fix typo. http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?r1=714101r2=714100 +1: rjung -1: Modified: tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc?rev=815740r1=815739r2=815740view=diff == --- tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc (original) +++ tomcat/native/branches/1.1.x/native/os/win32/libtcnative.rc Wed Sep 16 12:43:58 2009 @@ -20,7 +20,7 @@ See the License for the specific language governing \ permissions and limitations under the License. -#define TCN_VERISON 1.1.16 +#define TCN_VERSION 1.1.16 1000 ICON apache.ico 1001 DIALOGEX 0, 0, 252, 51 @@ -55,12 +55,12 @@ VALUE Comments, TCN_LICENSE \0 VALUE CompanyName, Apache Software Foundation\0 VALUE FileDescription, Tomcat Native Java Library\0 -VALUE FileVersion, TCN_VERISON \0 +VALUE FileVersion, TCN_VERSION \0 VALUE InternalName, libtcnative-1\0 VALUE LegalCopyright, TCN_COPYRIGHT \0 VALUE OriginalFilename, libtcnative-1.dll\0 VALUE ProductName, Tomcat Native Java Library\0 -VALUE ProductVersion, TCN_VERISON \0 +VALUE ProductVersion, TCN_VERSION \0 END END BLOCK VarFileInfo - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815742 - in /tomcat/native/branches/1.1.x: STATUS.txt build.xml xdocs/style.xsl
Author: rjung
Date: Wed Sep 16 12:48:18 2009
New Revision: 815742
URL: http://svn.apache.org/viewvc?rev=815742view=rev
Log:
Update copyright year.
Modified:
tomcat/native/branches/1.1.x/STATUS.txt
tomcat/native/branches/1.1.x/build.xml
tomcat/native/branches/1.1.x/xdocs/style.xsl
Modified: tomcat/native/branches/1.1.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815742r1=815741r2=815742view=diff
==
--- tomcat/native/branches/1.1.x/STATUS.txt (original)
+++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 12:48:18 2009
@@ -31,11 +31,6 @@
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Update copyright year for tc native. Backport of
- http://svn.apache.org/viewvc?rev=733829view=rev
- +1: rjung
- -1:
-
* Fix typo.
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?r1=714101r2=714100
+1: rjung
Modified: tomcat/native/branches/1.1.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=815742r1=815741r2=815742view=diff
==
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Wed Sep 16 12:48:18 2009
@@ -105,7 +105,7 @@
packagenames=org.apache.tomcat.*
windowtitle=${title} (Version ${version})
doctitle=lt;h1gt;${title} (Version ${version})lt;/h1gt;
-bottom=Copyright 2002-2004 The Apache Software Foundation.lt;!--
+bottom=Copyright 2002-2009 The Apache Software Foundation.lt;!--
Licensed under the Apache License, Version 2.0 (the 'License');
you may not use this file except in compliance with the License.
Modified: tomcat/native/branches/1.1.x/xdocs/style.xsl
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/style.xsl?rev=815742r1=815741r2=815742view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/style.xsl (original)
+++ tomcat/native/branches/1.1.x/xdocs/style.xsl Wed Sep 16 12:48:18 2009
@@ -178,7 +178,7 @@
xsl:commentPAGE FOOTER/xsl:comment
trtd colspan=2
div align=centerfont color={$body-link} size=-1em
-Copyright #169; 2008, Apache Software Foundation
+Copyright #169; 2008-2009, Apache Software Foundation
/em/font/div
/td/tr
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815746 - in /tomcat/native/branches/1.1.x: STATUS.txt native/build/tcnative.m4
Author: rjung
Date: Wed Sep 16 12:50:01 2009
New Revision: 815746
URL: http://svn.apache.org/viewvc?rev=815746view=rev
Log:
Fix typo in configure output.
Modified:
tomcat/native/branches/1.1.x/STATUS.txt
tomcat/native/branches/1.1.x/native/build/tcnative.m4
Modified: tomcat/native/branches/1.1.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815746r1=815745r2=815746view=diff
==
--- tomcat/native/branches/1.1.x/STATUS.txt (original)
+++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 12:50:01 2009
@@ -31,11 +31,6 @@
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix typo.
-
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?r1=714101r2=714100
- +1: rjung
- -1:
-
* Fix typo. Second hunk of
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java?r1=466585r2=730523
+1: rjung
Modified: tomcat/native/branches/1.1.x/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/tcnative.m4?rev=815746r1=815745r2=815746view=diff
==
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Wed Sep 16 12:50:01
2009
@@ -164,7 +164,7 @@
fi
AC_ARG_WITH(java-platform,
- [ --with-java-platform[=2] Force the Java platorm
+ [ --with-java-platform[=2] Force the Java platform
(value is 1 for 1.1.x or 2 for 1.2.x or
greater)],
[
case ${withval} in
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815748 - in /tomcat/native/branches/1.1.x: STATUS.txt java/org/apache/tomcat/jni/SSLContext.java
Author: rjung Date: Wed Sep 16 12:56:21 2009 New Revision: 815748 URL: http://svn.apache.org/viewvc?rev=815748view=rev Log: Fix typo in method name to align native and Java side. setShutdowType() - setShutdownType() Modified: tomcat/native/branches/1.1.x/STATUS.txt tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java Modified: tomcat/native/branches/1.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815748r1=815747r2=815748view=diff == --- tomcat/native/branches/1.1.x/STATUS.txt (original) +++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 12:56:21 2009 @@ -31,11 +31,6 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Fix typo. Second hunk of - http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/SSLContext.java?r1=466585r2=730523 - +1: rjung - -1: - * Fix typo Mulicast - Multicast. http://svn.eu.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/multicast.c?r1=525493r2=730523 +1: rjung Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java?rev=815748r1=815747r2=815748view=diff == --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java (original) +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java Wed Sep 16 12:56:21 2009 @@ -237,7 +237,7 @@ * @param ctx Server or Client context to use. * @param type Shutdown type to use. */ -public static native void setShutdowType(long ctx, int type); +public static native void setShutdownType(long ctx, int type); /** * Set Type of Client Certificate verification and Maximum depth of CA Certificates - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815750 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Sep 16 13:00:51 2009 New Revision: 815750 URL: http://svn.apache.org/viewvc?rev=815750view=rev Log: Add 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=815750r1=815749r2=815750view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 16 13:00:51 2009 @@ -293,13 +293,13 @@ * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47826 Broken debug message http://svn.apache.org/viewvc?rev=814180view=rev - +1: markt + +1: markt, rjung -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47796 Fix OpenEJB integration. Reset annotation processor on context stop. https://issues.apache.org/bugzilla/attachment.cgi?id=24222 - +1: markt + +1: markt, rjung -1: * Make FileHandler.java extensible @@ -327,3 +327,9 @@ https://issues.apache.org/bugzilla/attachment.cgi?id=24272 +1: markt -1: + +* Align native and Java method names. + Port/backport from trunk, TC5.5.x, tc4.1.x and tcnative (trunk and 1.1.x) + http://svn.apache.org/viewvc?rev=815748view=rev + +1: rjung + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815752 - in /tomcat/native/branches/1.1.x: STATUS.txt native/src/multicast.c
Author: rjung
Date: Wed Sep 16 13:05:22 2009
New Revision: 815752
URL: http://svn.apache.org/viewvc?rev=815752view=rev
Log:
Fix indentation changed by r815348.
Modified:
tomcat/native/branches/1.1.x/STATUS.txt
tomcat/native/branches/1.1.x/native/src/multicast.c
Modified: tomcat/native/branches/1.1.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815752r1=815751r2=815752view=diff
==
--- tomcat/native/branches/1.1.x/STATUS.txt (original)
+++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 13:05:22 2009
@@ -31,11 +31,6 @@
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix typo Mulicast - Multicast.
-
http://svn.eu.apache.org/viewvc/tomcat/connectors/trunk/jni/native/src/multicast.c?r1=525493r2=730523
- +1: rjung
- -1:
-
* Backport remaining parts of
http://svn.eu.apache.org/viewvc?view=revrevision=730523
I separated the non typo parts at
Modified: tomcat/native/branches/1.1.x/native/src/multicast.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/multicast.c?rev=815752r1=815751r2=815752view=diff
==
--- tomcat/native/branches/1.1.x/native/src/multicast.c (original)
+++ tomcat/native/branches/1.1.x/native/src/multicast.c Wed Sep 16 13:05:22 2009
@@ -23,8 +23,8 @@
#include tcn.h
TCN_IMPLEMENT_CALL(jint, Multicast, join)(TCN_STDARGS,
- jlong sock, jlong join,
- jlong iface, jlong source)
+ jlong sock, jlong join,
+ jlong iface, jlong source)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
apr_sockaddr_t *ja = J2P(join, apr_sockaddr_t *);
@@ -35,8 +35,8 @@
};
TCN_IMPLEMENT_CALL(jint, Multicast, leave)(TCN_STDARGS,
- jlong sock, jlong addr,
- jlong iface, jlong source)
+ jlong sock, jlong addr,
+ jlong iface, jlong source)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
apr_sockaddr_t *aa = J2P(addr, apr_sockaddr_t *);
@@ -47,7 +47,7 @@
};
TCN_IMPLEMENT_CALL(jint, Multicast, hops)(TCN_STDARGS,
- jlong sock, jint ttl)
+ jlong sock, jint ttl)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
UNREFERENCED_STDARGS;
@@ -55,7 +55,7 @@
};
TCN_IMPLEMENT_CALL(jint, Multicast, loopback)(TCN_STDARGS,
- jlong sock, jboolean opt)
+ jlong sock, jboolean opt)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
apr_byte_t on = 0;
@@ -66,7 +66,7 @@
};
TCN_IMPLEMENT_CALL(jint, Multicast, ointerface)(TCN_STDARGS,
- jlong sock, jlong iface)
+jlong sock, jlong iface)
{
tcn_socket_t *s = J2P(sock, tcn_socket_t *);
apr_sockaddr_t *ia = J2P(iface, apr_sockaddr_t *);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815760 - /tomcat/native/branches/1.1.x/native/src/address.c
Author: rjung
Date: Wed Sep 16 13:21:27 2009
New Revision: 815760
URL: http://svn.apache.org/viewvc?rev=815760view=rev
Log:
Fix indentation.
Modified:
tomcat/native/branches/1.1.x/native/src/address.c
Modified: tomcat/native/branches/1.1.x/native/src/address.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/address.c?rev=815760r1=815759r2=815760view=diff
==
--- tomcat/native/branches/1.1.x/native/src/address.c (original)
+++ tomcat/native/branches/1.1.x/native/src/address.c Wed Sep 16 13:21:27 2009
@@ -104,7 +104,7 @@
}
TCN_IMPLEMENT_CALL(jboolean, Address, equal)(TCN_STDARGS,
- jlong a, jlong b)
+ jlong a, jlong b)
{
apr_sockaddr_t *sa = J2P(a, apr_sockaddr_t *);
apr_sockaddr_t *sb = J2P(b, apr_sockaddr_t *);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815765 - /tomcat/native/branches/1.1.x/native/src/sslcontext.c
Author: rjung
Date: Wed Sep 16 13:23:21 2009
New Revision: 815765
URL: http://svn.apache.org/viewvc?rev=815765view=rev
Log:
Remove trailing whitespace.
Modified:
tomcat/native/branches/1.1.x/native/src/sslcontext.c
Modified: tomcat/native/branches/1.1.x/native/src/sslcontext.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?rev=815765r1=815764r2=815765view=diff
==
--- tomcat/native/branches/1.1.x/native/src/sslcontext.c (original)
+++ tomcat/native/branches/1.1.x/native/src/sslcontext.c Wed Sep 16 13:23:21
2009
@@ -494,7 +494,7 @@
jstring file)
{
tcn_ssl_ctxt_t *c = J2P(ctx, tcn_ssl_ctxt_t *);
-TCN_ALLOC_CSTRING(file);
+TCN_ALLOC_CSTRING(file);
TCN_ASSERT(ctx != 0);
UNREFERENCED(o);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815768 - in /tomcat/native/branches/1.1.x: ./ java/org/apache/tomcat/jni/
Author: rjung Date: Wed Sep 16 13:24:54 2009 New Revision: 815768 URL: http://svn.apache.org/viewvc?rev=815768view=rev Log: Sync java parts of tcnative with C part. Modified: tomcat/native/branches/1.1.x/STATUS.txt tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/SSLContext.java tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Stdlib.java Modified: tomcat/native/branches/1.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815768r1=815767r2=815768view=diff == --- tomcat/native/branches/1.1.x/STATUS.txt (original) +++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 13:24:54 2009 @@ -30,18 +30,3 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] - -* Backport remaining parts of - http://svn.eu.apache.org/viewvc?view=revrevision=730523 - I separated the non typo parts at - http://people.apache.org/~rjung/patches/jni.patch - +1: rjung - -1: - -* Sync native and Java methods. Patch available at - http://people.apache.org/~rjung/patches/tcnative-sync.patch - Partial backport of - http://svn.apache.org/viewvc?view=revrevision=730523 - +1: rjung, mturk - 0: - -1: Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java?rev=815768r1=815767r2=815768view=diff == --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java (original) +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Buffer.java Wed Sep 16 13:24:54 2009 @@ -32,7 +32,7 @@ * @param size The amount of memory to allocate * @return The ByteBuffer with allocated memory */ -public static native ByteBuffer alloc(int size); +public static native ByteBuffer malloc(int size); /** * Allocate a new ByteBuffer from memory and set all of the memory to 0 @@ -86,6 +86,6 @@ * Returns the allocated memory size of the ByteBuffer. * @param buf Previously allocated ByteBuffer. */ -public static native int size(ByteBuffer buf); +public static native long size(ByteBuffer buf); } Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java?rev=815768r1=815767r2=815768view=diff == --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java (original) +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/File.java Wed Sep 16 13:24:54 2009 @@ -693,6 +693,16 @@ public static native int stat(FileInfo finfo, String fname, int wanted, long pool); /** + * Get the specified file's stats. The file is specified by filename, + * instead of using a pre-opened file. + * @param fname The name of the file to stat. + * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values + * @param pool the pool to use to allocate the new file. + * @return FileInfo object. + */ +public static native FileInfo getStat(String fname, int wanted, long pool); + +/** * Get the specified file's stats. * @param finfo Where to store the information about the file. * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values @@ -700,4 +710,13 @@ */ public static native int infoGet(FileInfo finfo, int wanted, long thefile); + +/** + * Get the specified file's stats. + * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values + * @param thefile The file to get information about. + * @return FileInfo object. + */ +public static native FileInfo getInfo(int wanted, long thefile); + } Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java?rev=815768r1=815767r2=815768view=diff == --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java (original) +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java Wed Sep 16 13:24:54 2009 @@ -156,7 +156,7 @@ * @param val The the value to set * @return If the function succeeds, the return value is 0 */ -public static native int setValueJ(long key, String name, int
svn commit: r815772 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Sep 16 13:33:32 2009 New Revision: 815772 URL: http://svn.apache.org/viewvc?rev=815772view=rev Log: Update 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=815772r1=815771r2=815772view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 16 13:33:32 2009 @@ -331,5 +331,9 @@ * Align native and Java method names. Port/backport from trunk, TC5.5.x, tc4.1.x and tcnative (trunk and 1.1.x) http://svn.apache.org/viewvc?rev=815748view=rev + http://svn.apache.org/viewvc?rev=815768view=rev +1: rjung -1: + rjung: Note that java/org/apache/tomcat/jni/Buffer.java + is missing in TC 6. Don't know, whether we should add it. + It is in 5.5, trunk and tcnative 1.1. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815773 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Sep 16 13:39:50 2009 New Revision: 815773 URL: http://svn.apache.org/viewvc?rev=815773view=rev Log: ... and another update of 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=815773r1=815772r2=815773view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 16 13:39:50 2009 @@ -332,6 +332,7 @@ Port/backport from trunk, TC5.5.x, tc4.1.x and tcnative (trunk and 1.1.x) http://svn.apache.org/viewvc?rev=815748view=rev http://svn.apache.org/viewvc?rev=815768view=rev + http://svn.apache.org/viewvc?rev=706574view=rev +1: rjung -1: rjung: Note that java/org/apache/tomcat/jni/Buffer.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815781 - /tomcat/native/branches/1.1.x/CHANGELOG.txt
Author: rjung Date: Wed Sep 16 13:51:34 2009 New Revision: 815781 URL: http://svn.apache.org/viewvc?rev=815781view=rev Log: Remove old changelog entries from plain text changelog and reformat warning. I checked, that all old entries are actually contained in the xml/html version. Modified: tomcat/native/branches/1.1.x/CHANGELOG.txt Modified: tomcat/native/branches/1.1.x/CHANGELOG.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/CHANGELOG.txt?rev=815781r1=815780r2=815781view=diff == --- tomcat/native/branches/1.1.x/CHANGELOG.txt (original) +++ tomcat/native/branches/1.1.x/CHANGELOG.txt Wed Sep 16 13:51:34 2009 @@ -15,19 +15,9 @@ TOMCAT NATIVE CHANGELOG: -*-text-*- Last modified at [$Date$] -PLEASE DON'T WRITE IN THIS FILE BUT IN xdocs/miscellaneous/changelog.xml AND USE -./jnirelease.sh -TO BUILD THE TEXT VERSION. -Fix: BZ45071 by reseting ttl when Poll.pool remove is false(mturk) -Fix: IFS problem in native/build/tcnative.m4 (rjung) -Fix: Wrong gcc link flag in native/build/tcnative.m4 (rjung) -Tag: 1_1.12 -Improvement: Add support of J9VM based JVM. (jfclere) -Improvement: Arrange licence in source files. (markt). -Improvement: Add two new 'immediate' methods for sending the data. - It is the responsibility of the Java callee to deal with - the returned values and retry if the error was non-fatal. (mturk) -Fix: Arrange the check of openssl version. It was failing on Linux. (jfclere) -Fix: Prevent returning APR_SUCCESS when there is something wrong in ssl layer. Fix for PR: 44087 (jfclere) -Tag: 1_1.11 +PLEASE DON'T WRITE IN THIS FILE BUT IN +xdocs/miscellaneous/changelog.xml +AND USE +./jnirelease.sh +TO BUILD THE TEXT VERSION. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815794 - /tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Author: rjung Date: Wed Sep 16 14:08:20 2009 New Revision: 815794 URL: http://svn.apache.org/viewvc?rev=815794view=rev Log: Update changelog. Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=815794r1=815793r2=815794view=diff == --- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Wed Sep 16 14:08:20 2009 @@ -33,9 +33,37 @@ This is the Changelog for Tomcat Native. This changelog does not contain all updates and fixes to the Tomcat Native (yet). It should contain fixes made only after December 19th 2007, when the - new documentation project for Tomcat Native was started. + new documentation project for Tomcat Native was started. /p /section +section name=Changes between 1.1.16 and 1.1.17 + changelog +fix + bug46950/bug: Fix SSL renegotiation in combination with client + certificates. The complete solution also needs a fix in Tomcat's Java code. (markt) +/fix +fix + Align method names and signatures of native C code and java code. (markt, rjung) +/fix +fix + bug42728/bug: Remove memory leak. (markt) +/fix +fix + bug46457/bug: Fix use of multicast. (markt) +/fix +fix + Fix API name for recvfrom (mturk) +/fix +fix + Allow building against APR 1.3 (mturk) +/fix +fix + Improve fix for bug43327/bug with better handling for IPv6 + addresses (markt) +/fix + /changelog +/section + section name=Changes between 1.1.15 and 1.1.16 changelog fix - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815792 - /tomcat/native/branches/1.1.x/STATUS.txt
Author: rjung Date: Wed Sep 16 14:06:33 2009 New Revision: 815792 URL: http://svn.apache.org/viewvc?rev=815792view=rev Log: Add proposal. Modified: tomcat/native/branches/1.1.x/STATUS.txt Modified: tomcat/native/branches/1.1.x/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/STATUS.txt?rev=815792r1=815791r2=815792view=diff == --- tomcat/native/branches/1.1.x/STATUS.txt (original) +++ tomcat/native/branches/1.1.x/STATUS.txt Wed Sep 16 14:06:33 2009 @@ -30,3 +30,7 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] + +* Add detection of the macosx jvm. + Backport from trunk + http://svn.eu.apache.org/viewvc?view=revrevision=803803 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815814 - in /tomcat/native/branches/1.1.x: java/org/apache/tomcat/jni/Local.java java/org/apache/tomcat/jni/Poll.java java/org/apache/tomcat/jni/Registry.java java/org/apache/tomcat/jni/S
Author: rjung Date: Wed Sep 16 14:49:23 2009 New Revision: 815814 URL: http://svn.apache.org/viewvc?rev=815814view=rev Log: Fix BZ47852: Fix some Javadoc errors. Patch provided by Sebb. Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Local.java tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Poll.java tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Local.java URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Local.java?rev=815814r1=815813r2=815814view=diff == --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Local.java (original) +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Local.java Wed Sep 16 14:49:23 2009 @@ -56,7 +56,6 @@ /** * Accept a new connection request * @param sock The socket we are listening on. - * @param pool The pool for the new socket. * @return A copy of the socket that is connected to the socket that * made the connection request. This is the socket which should * be used for all future communication. Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Poll.java URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Poll.java?rev=815814r1=815813r2=815814view=diff == --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Poll.java (original) +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Poll.java Wed Sep 16 14:49:23 2009 @@ -79,7 +79,6 @@ * descriptor is signalled in apr_pollset_poll(). * @param pollset The pollset to which to add the descriptor * @param sock The sockets to add - * @param data Client data to add * @param reqevents requested events */ public static native int add(long pollset, long sock, Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java?rev=815814r1=815813r2=815814view=diff == --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java (original) +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Registry.java Wed Sep 16 14:49:23 2009 @@ -56,7 +56,8 @@ * Create or open a Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long create(int root, String name, int sam, long pool) @@ -66,7 +67,8 @@ * Opens the specified Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long open(int root, String name, int sam, long pool) @@ -197,7 +199,6 @@ /** * Enumerate the Registry subkeys * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all subkey names */ public static native String[] enumKeys(long key) @@ -206,7 +207,6 @@ /** * Enumerate the Registry values * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all value names */ public static native String[] enumValues(long key) Modified: tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java?rev=815814r1=815813r2=815814view=diff == --- tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java (original) +++ tomcat/native/branches/1.1.x/java/org/apache/tomcat/jni/Socket.java Wed Sep 16 14:49:23 2009 @@ -554,7 +554,7 @@ * Set internal send ByteBuffer. * This function will preset internal Java ByteBuffer for * consecutive sendbb calls. - * @param thesocket The socket to use + * @param sock The socket to use * @param buf The ByteBuffer */ public
svn commit: r815816 - in /tomcat/trunk/java/org/apache/tomcat/jni: Local.java Poll.java Registry.java Socket.java
Author: rjung Date: Wed Sep 16 14:54:07 2009 New Revision: 815816 URL: http://svn.apache.org/viewvc?rev=815816view=rev Log: BZ47852: Javadoc fixes. Patch by Sebb. Modified: tomcat/trunk/java/org/apache/tomcat/jni/Local.java tomcat/trunk/java/org/apache/tomcat/jni/Poll.java tomcat/trunk/java/org/apache/tomcat/jni/Registry.java tomcat/trunk/java/org/apache/tomcat/jni/Socket.java Modified: tomcat/trunk/java/org/apache/tomcat/jni/Local.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Local.java?rev=815816r1=815815r2=815816view=diff == --- tomcat/trunk/java/org/apache/tomcat/jni/Local.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Local.java Wed Sep 16 14:54:07 2009 @@ -56,7 +56,6 @@ /** * Accept a new connection request * @param sock The socket we are listening on. - * @param pool The pool for the new socket. * @return A copy of the socket that is connected to the socket that * made the connection request. This is the socket which should * be used for all future communication. Modified: tomcat/trunk/java/org/apache/tomcat/jni/Poll.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Poll.java?rev=815816r1=815815r2=815816view=diff == --- tomcat/trunk/java/org/apache/tomcat/jni/Poll.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Poll.java Wed Sep 16 14:54:07 2009 @@ -79,7 +79,6 @@ * descriptor is signalled in apr_pollset_poll(). * @param pollset The pollset to which to add the descriptor * @param sock The sockets to add - * @param data Client data to add * @param reqevents requested events */ public static native int add(long pollset, long sock, Modified: tomcat/trunk/java/org/apache/tomcat/jni/Registry.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Registry.java?rev=815816r1=815815r2=815816view=diff == --- tomcat/trunk/java/org/apache/tomcat/jni/Registry.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Registry.java Wed Sep 16 14:54:07 2009 @@ -56,7 +56,8 @@ * Create or open a Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long create(int root, String name, int sam, long pool) @@ -66,7 +67,8 @@ * Opens the specified Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long open(int root, String name, int sam, long pool) @@ -197,7 +199,6 @@ /** * Enumerate the Registry subkeys * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all subkey names */ public static native String[] enumKeys(long key) @@ -206,7 +207,6 @@ /** * Enumerate the Registry values * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all value names */ public static native String[] enumValues(long key) Modified: tomcat/trunk/java/org/apache/tomcat/jni/Socket.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Socket.java?rev=815816r1=815815r2=815816view=diff == --- tomcat/trunk/java/org/apache/tomcat/jni/Socket.java (original) +++ tomcat/trunk/java/org/apache/tomcat/jni/Socket.java Wed Sep 16 14:54:07 2009 @@ -554,7 +554,7 @@ * Set internal send ByteBuffer. * This function will preset internal Java ByteBuffer for * consecutive sendbb calls. - * @param thesocket The socket to use + * @param sock The socket to use * @param buf The ByteBuffer */ public static native void setsbb(long sock, ByteBuffer buf); @@ -563,7 +563,7 @@ * Set internal receive ByteBuffer. * This function will preset internal Java ByteBuffer for * consecutive revcvbb/recvbbt calls. - * @param thesocket The socket to use + * @param sock The socket to use * @param buf The ByteBuffer */ public static native void setrbb(long sock, ByteBuffer buf); @@ -573,13
svn commit: r815818 - in /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni: Local.java Poll.java Registry.java Socket.java
Author: rjung Date: Wed Sep 16 14:56:50 2009 New Revision: 815818 URL: http://svn.apache.org/viewvc?rev=815818view=rev Log: BZ47852: Fix Javadoc errors. Patch by Sebb. Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java?rev=815818r1=815817r2=815818view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Local.java Wed Sep 16 14:56:50 2009 @@ -56,7 +56,6 @@ /** * Accept a new connection request * @param sock The socket we are listening on. - * @param pool The pool for the new socket. * @return A copy of the socket that is connected to the socket that * made the connection request. This is the socket which should * be used for all future communication. Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java?rev=815818r1=815817r2=815818view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Poll.java Wed Sep 16 14:56:50 2009 @@ -79,7 +79,6 @@ * descriptor is signalled in apr_pollset_poll(). * @param pollset The pollset to which to add the descriptor * @param sock The sockets to add - * @param data Client data to add * @param reqevents requested events */ public static native int add(long pollset, long sock, Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java?rev=815818r1=815817r2=815818view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Registry.java Wed Sep 16 14:56:50 2009 @@ -56,7 +56,8 @@ * Create or open a Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long create(int root, String name, int sam, long pool) @@ -66,7 +67,8 @@ * Opens the specified Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long open(int root, String name, int sam, long pool) @@ -197,7 +199,6 @@ /** * Enumerate the Registry subkeys * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all subkey names */ public static native String[] enumKeys(long key) @@ -206,7 +207,6 @@ /** * Enumerate the Registry values * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all value names */ public static native String[] enumValues(long key) Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java?rev=815818r1=815817r2=815818view=diff == --- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/jni/Socket.java Wed Sep 16 14:56:50 2009 @@ -513,7 +513,7 @@ * Set internal send ByteBuffer. * This function will preset internal Java ByteBuffer for * consecutive sendbb calls. - * @param thesocket The socket to use + * @param sock The socket to use * @param buf The ByteBuffer */ public static native void setsbb(long sock, ByteBuffer buf); @@ -522,7 +522,7 @@ * Set internal receive ByteBuffer. * This function will preset internal Java ByteBuffer for * consecutive revcvbb/recvbbt calls. - * @param thesocket
svn commit: r815819 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: rjung Date: Wed Sep 16 14:58:25 2009 New Revision: 815819 URL: http://svn.apache.org/viewvc?rev=815819view=rev Log: Update (once more) 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=815819r1=815818r2=815819view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 16 14:58:25 2009 @@ -333,6 +333,8 @@ http://svn.apache.org/viewvc?rev=815748view=rev http://svn.apache.org/viewvc?rev=815768view=rev http://svn.apache.org/viewvc?rev=706574view=rev + Plus the last hunk for Socket.java in + https://issues.apache.org/bugzilla/attachment.cgi?id=24276 +1: rjung -1: rjung: Note that java/org/apache/tomcat/jni/Buffer.java - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815820 - in /tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni: Local.java Poll.java Registry.java Socket.java
Author: rjung Date: Wed Sep 16 14:59:56 2009 New Revision: 815820 URL: http://svn.apache.org/viewvc?rev=815820view=rev Log: BZ47852: Fix Javadoc errors. Patch by Sebb. Modified: tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java Modified: tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java?rev=815820r1=815819r2=815820view=diff == --- tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java (original) +++ tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java Wed Sep 16 14:59:56 2009 @@ -56,7 +56,6 @@ /** * Accept a new connection request * @param sock The socket we are listening on. - * @param pool The pool for the new socket. * @return A copy of the socket that is connected to the socket that * made the connection request. This is the socket which should * be used for all future communication. Modified: tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java?rev=815820r1=815819r2=815820view=diff == --- tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java (original) +++ tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java Wed Sep 16 14:59:56 2009 @@ -79,7 +79,6 @@ * descriptor is signalled in apr_pollset_poll(). * @param pollset The pollset to which to add the descriptor * @param sock The sockets to add - * @param data Client data to add * @param reqevents requested events */ public static native int add(long pollset, long sock, Modified: tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java?rev=815820r1=815819r2=815820view=diff == --- tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java (original) +++ tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java Wed Sep 16 14:59:56 2009 @@ -56,7 +56,8 @@ * Create or open a Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long create(int root, String name, int sam, long pool) @@ -66,7 +67,8 @@ * Opens the specified Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long open(int root, String name, int sam, long pool) @@ -197,7 +199,6 @@ /** * Enumerate the Registry subkeys * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all subkey names */ public static native String[] enumKeys(long key) @@ -206,7 +207,6 @@ /** * Enumerate the Registry values * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all value names */ public static native String[] enumValues(long key) Modified: tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java?rev=815820r1=815819r2=815820view=diff == --- tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java (original) +++ tomcat/tc5.5.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java Wed Sep 16 14:59:56 2009 @@ -554,7 +554,7 @@ * Set internal send ByteBuffer. * This function will preset internal Java ByteBuffer for * consecutive sendbb calls. - * @param thesocket The socket to use + * @param sock The socket
svn commit: r815821 - in /tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni: Local.java Poll.java Registry.java Socket.java
Author: rjung Date: Wed Sep 16 15:00:50 2009 New Revision: 815821 URL: http://svn.apache.org/viewvc?rev=815821view=rev Log: BZ47852: Fix Javadoc errors. Patch by Sebb. Modified: tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java Modified: tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java URL: http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java?rev=815821r1=815820r2=815821view=diff == --- tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java (original) +++ tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Local.java Wed Sep 16 15:00:50 2009 @@ -56,7 +56,6 @@ /** * Accept a new connection request * @param sock The socket we are listening on. - * @param pool The pool for the new socket. * @return A copy of the socket that is connected to the socket that * made the connection request. This is the socket which should * be used for all future communication. Modified: tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java URL: http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java?rev=815821r1=815820r2=815821view=diff == --- tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java (original) +++ tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Poll.java Wed Sep 16 15:00:50 2009 @@ -79,7 +79,6 @@ * descriptor is signalled in apr_pollset_poll(). * @param pollset The pollset to which to add the descriptor * @param sock The sockets to add - * @param data Client data to add * @param reqevents requested events */ public static native int add(long pollset, long sock, Modified: tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java URL: http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java?rev=815821r1=815820r2=815821view=diff == --- tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java (original) +++ tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Registry.java Wed Sep 16 15:00:50 2009 @@ -56,7 +56,8 @@ * Create or open a Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long create(int root, String name, int sam, long pool) @@ -66,7 +67,8 @@ * Opens the specified Registry Key. * @param name Registry Subkey to open * @param root Root key, one of HKEY_* - * @param som Access mask that specifies the access rights for the key. + * @param sam Access mask that specifies the access rights for the key. + * @param pool Pool used for native memory allocation * @return Opened Registry key */ public static native long open(int root, String name, int sam, long pool) @@ -197,7 +199,6 @@ /** * Enumerate the Registry subkeys * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all subkey names */ public static native String[] enumKeys(long key) @@ -206,7 +207,6 @@ /** * Enumerate the Registry values * @param key The Registry key descriptor to use. - * @param name The name of the value to query * @return Array of all value names */ public static native String[] enumValues(long key) Modified: tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java URL: http://svn.apache.org/viewvc/tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java?rev=815821r1=815820r2=815821view=diff == --- tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java (original) +++ tomcat/archive/tc4.1.x/trunk/connectors/jni/java/org/apache/tomcat/jni/Socket.java Wed Sep 16 15:00:50 2009 @@ -554,7 +554,7 @@ * Set internal send ByteBuffer
svn commit: r815845 - /tomcat/native/trunk/CHANGELOG.txt
Author: rjung Date: Wed Sep 16 15:41:24 2009 New Revision: 815845 URL: http://svn.apache.org/viewvc?rev=815845view=rev Log: Remove legacy change log from tcnative trunk. Removed: tomcat/native/trunk/CHANGELOG.txt - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815857 - in /tomcat/native/trunk: NOTICE NOTICE.txt
Author: rjung Date: Wed Sep 16 16:04:09 2009 New Revision: 815857 URL: http://svn.apache.org/viewvc?rev=815857view=rev Log: Remove NOTICE file according to standard in tcnative trunk. Added: tomcat/native/trunk/NOTICE (props changed) - copied unchanged from r815724, tomcat/native/trunk/NOTICE.txt Removed: tomcat/native/trunk/NOTICE.txt Propchange: tomcat/native/trunk/NOTICE -- svn:eol-style = native Propchange: tomcat/native/trunk/NOTICE -- svn:keywords = Author Date Id Revision Propchange: tomcat/native/trunk/NOTICE -- svn:mergeinfo = - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815859 - in /tomcat/native/trunk: KEYS LICENSE
Author: rjung Date: Wed Sep 16 16:17:49 2009 New Revision: 815859 URL: http://svn.apache.org/viewvc?rev=815859view=rev Log: Add KEYS and LICENSE to tcnative trunk to make it more self-contained. KEYS contains the keys that were used up to now to sign tcnative releases. Added: tomcat/native/trunk/KEYS (with props) tomcat/native/trunk/LICENSE (with props) Added: tomcat/native/trunk/KEYS URL: http://svn.apache.org/viewvc/tomcat/native/trunk/KEYS?rev=815859view=auto == --- tomcat/native/trunk/KEYS (added) +++ tomcat/native/trunk/KEYS Wed Sep 16 16:17:49 2009 @@ -0,0 +1,328 @@ +This file contains the PGPGPG keys of various Apache developers. +Please don't use them for email unless you have to. Their main +purpose is code signing. + +Apache users: pgp KEYS +Apache developers: +(pgpk -ll your name pgpk -xa your name) this file. + or +(gpg --fingerprint --list-sigs your name + gpg --armor --export your name) this file. + +Apache developers: please ensure that your key is also available via the +PGP keyservers (such as pgpkeys.mit.edu). + + +Type Bits/KeyID Date User ID +pub 1024D/564C17A3 2003-01-11 Mladen Turk mt...@apache.org + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.0.6 (MingW32) + +mQGiBD4fwXIRBAC7WRS8PYxi2YH0T1mX4HCYsF8aHoqxBzMnyFR4J896m1s96vGM +BTSAwH2NKbiVqtfLokTbQkUVxtrgrF2HMB5NfYBg/JzT7pZL/Q2ThWUS7SJQQA4f +a7/DpiLiHalp6iX45om6JTdIWEyXv26csIVhmtlkGBEPRhNRX8X4//BM0wCg7wcA +yQ7c5NmoOJLVs+uHsRrnHo0D/R/dMyuWt7/o0eGIEuRlDl2q+YL8xLuVyJMXQBnd +jo7jKpQ+Q1zl93aVTzsJa7mP2zZ7jqaJ855sdz6rvwyhGF1/qYMtm6zrmgBy2XPm +J+57sfwSZr0bhIeMpCWjIw98z9sObq0v2r2oA3+J9E3Na/BZsCVTZVb3ew7ILmEp +F5D7A/4zvjY41dakCAJsD1Xo8TS6hSqJf4zq9vX3ayJVvUjeo8n4sHNOwcbEnnui +9zZaUH3F0x+3cDo7mS1Y4pD8THuqCZoSbSkiHnlved6nLXsKbqvVrVo+esEhfZCn +Iji3gp+2TVNwdHXGM+4BAzMJCLsdXjByO6SNzB9a+H8RsRlZKrQ8TWxhZGVuIFR1 +cmsgKCoqKiBERUZBVUxUIFNJR05JTkcgS0VZICoqKikgPG10dXJrQGFwYWNoZS5v +cmc+iF0EExECAB0FAj4fwXIFCRLP94AFCwcKAwQDFQMCAxYCAQIXgAAKCRAcUGQH +VkwXo0jxAKCgHzXPIB4IAgoD7GMAohPQfX7j2QCeL6pAsf4pPufmPvbrrpDp6rQH +GOS5Ag0EPh/BhhAIAKWzq7+/+nNYGpc7sXGkDNo9xncxcx/KbbJVT0rBteuaonQ4 +vYar1ITjIhOPmF9yPmpUddNrqgQTSO+Or+ZrVOndn+qC1gdY3qpKIN3KTjXloW38 +0Y84ezwdRLznQNkhgXwNcB55l/Z9kLaW2MS8CJzOuYSQT1CYbXg7XP3684ZmV1KC +cGgcUt9VkIGqwsa2RFDNGvMbySedSkJ/70Q+PJlkXN+W86f8hi3HTjw2MCkNa5NL ++Byg8FEAm95YWrO6kCY3qaJYV7NRt9oVd+2V/NNzwYp3Or/QoYofvfNerupfwBmU +GEXPyZCqqNH6nDv6chscsWvEA9KzhsWnsdKhmHsAAwUH/R6LwfWgtpaO42dQI4ZS +VRBmCeWrXCuyVk0d13Yz0xLi5Z5m4g3MON3d+cRVUiyNX+hbDGpi2mkbsnL559Ef +iqmzDmSz5GQHDutolhOPtLxLrC537ODn2q7hnYQwIQYYIUtYD5sYlzfGYC8olGCB +IcKIdlGRWcxxiFCIJm5CX/jnSBsyDRpanlSrdkxhzAGsifqj4NQ19ayoeNoZg2ZP +9SLIY7vbmOxJeHEYkx8AG25xOY1PLotb/0buSXPB8e71zb/DCV1rAhhUxAr/2JOQ +RqlZBq6PfcHKLRitXRCeVvfldRxuWBIzhuTLUfRPYR6phjP50EzZPlbJzIvGwsOI +RheITAQYEQIADAUCPh/BhgUJEs/3gAAKCRAcUGQHVkwXoy0JAJ9WTfqfYzW/F6qi +5MxmqDnU9/G+6ACfQVmhZNnGTSfcwQCttwCaW3CRhDY= +=MWUr +-END PGP PUBLIC KEY BLOCK- + +pub 1024D/6210BFC0 2007-03-01 + Key fingerprint = 3A6F 081D DFD3 DE93 02C3 1329 0F45 0A26 6210 BFC0 +uid Jean-Frederic Clere jfcl...@apache.org + +-BEGIN PGP PUBLIC KEY BLOCK- +Version: GnuPG v1.4.6 (FreeBSD) + +mQGiBEAzyJIRBADK4dV4yXWrn/Y8QkbrRVIK8Tzct2UY/OXxYfIv/Tfqxi9h448d +lkDxjFWjnyOc1m1M6pU500o/KIeray6MOQM/zVBPo7iyv+FC7Rk5kczpcbu7EbS6 +nzOJaSVS8ExighNo5IACGcGP+Xs3p8CkHaHhxgKz4c1UX/u+hdabON4wZwCgrw6K +u7BuceEkEtNmT5FQC6SGFG8D/ixq6PVUg5vSFM592vdgFyqO9QRvffDe7dHTCA57 +PnSFbRSlpM08DsxmiMyUiZkwtVLvBJggOG2JJlq459xCUVFAw0OcPl+H5+DVU4HE +S0BWUL+i79SO+uuxl4EZ22q7uFyFII7AKDi+p5Ft88Y1CCNAtQdyGdxjcK27cC2Y +TZEZA/4yfGD0iPwYJo9je1XKmFV+tgjHKq/CNt4iEDU7hwmG642h1LBLDCXp4+F0 +cbNg4q8txjVW0ndpwv6/y+0yFTENdeBMhMEVgpsK70/1TNf8kf0dsv9129LNQ2Cs +6BfybRnQSKO9d6T9Lo4Zg2t6h3KOkT5dqj3MHaBUdVrDSHRXTIhSBCARAgASBQJF +ZC30Cx0CUEMgc3RvbGVuAAoJEPs32kAzLmPNblsAn2bWzVQiIMJkFXSr7hGThBkW +9CnoAKCY8TW1FFaaD9BEcuxrZjCAnp1z6bQoSmVhbi1GcmVkZXJpYyBDbGVyZSA8 +amZjbGVyZUBhcGFjaGUub3JnPoheBBMRAgAeBQJAM8iSAhsDBgsJCAcDAgMVAgMD +FgIBAh4BAheAAAoJEPs32kAzLmPNFQwAniz4ReBMjflXPuj/FMKSSsyeJjQuAJ0T +wWVBk9PTB7cvWZyT0AurUFPs5IicBBABAgAGBQJDYgMzAAoJEDfj9F/uZeMhn/8D +/2xuhUHiI7tlHQp2tQ8X5/JxmErDc6Kb7zQiCLAft+lGrJV5nLah05HOOtxYLP2o +kv8c1Zzbsa/C3k9v7BGg8+5vDfN89Bj2iCLb19G01O3pGqE0B1G1L2arLsysoW4b +1YrZIwqsEUkz3rR3ZNtI6M/z7WJboao6uWdpMjeWqMQdiEYEEBECAAYFAkSi3bsA +CgkQ9cJgFkzu11/4hgCfbvtk4qfyvo+jzaoj5u73suaQ8rEAn1L4lQECQe9blVWJ +LrFohPHBjUcJiEYEEBECAAYFAkSjAv0ACgkQlFBD9TXBAPCvVwCfYtR8GRKbudzU +YZRGBaYj6wXfc1sAoMsTuSm2cx5OBOiW6A0WHuXtr3ZUiEYEEBECAAYFAkSjnLIA +CgkQLSGrZWVGG3loNACfbdRmrrD3dJXZc6peaJvBNtITDVMAnAmCu9p+p/+a1Yps +TiuCuyRso9m5iEYEEBECAAYFAkSj9PEACgkQN/aP9QFa/IpmigCg0Ww8CYMRVBv7 +ncOTlvXOkE1yyrkAoMGb4A14TFxoQTx9rmDFh2+rWojRiEYEEBECAAYFAkSnztsA +CgkQ1TNOdbExPeIsugCgyuyNjR1fCib9WBETW5EfZFk17AUAn3cMSj/jnfXft3qB +4eap4X/JiyBiiEYEEBECAAYFAkSpMGoACgkQMsnkzjZCy0vymgCff2fuOEmRJGLs +D5mxgS6oax66BzQAnje+9oq6le3fKMX3VvyjrQdrP45+iEYEEBECAAYFAkSqsTsA
svn commit: r815868 - /tomcat/native/trunk/jnirelease.sh
Author: rjung Date: Wed Sep 16 16:36:10 2009 New Revision: 815868 URL: http://svn.apache.org/viewvc?rev=815868view=rev Log: Fix broken hash bang. Modified: tomcat/native/trunk/jnirelease.sh Modified: tomcat/native/trunk/jnirelease.sh URL: http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=815868r1=815867r2=815868view=diff == --- tomcat/native/trunk/jnirelease.sh (original) +++ tomcat/native/trunk/jnirelease.sh Wed Sep 16 16:36:10 2009 @@ -1,4 +1,4 @@ -#/bin/sh +#!/bin/sh # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815869 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung Date: Wed Sep 16 16:36:37 2009 New Revision: 815869 URL: http://svn.apache.org/viewvc?rev=815869view=rev Log: Fix broken hash bang. Modified: tomcat/native/branches/1.1.x/jnirelease.sh Modified: tomcat/native/branches/1.1.x/jnirelease.sh URL: http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=815869r1=815868r2=815869view=diff == --- tomcat/native/branches/1.1.x/jnirelease.sh (original) +++ tomcat/native/branches/1.1.x/jnirelease.sh Wed Sep 16 16:36:37 2009 @@ -1,4 +1,4 @@ -#/bin/sh +#!/bin/sh # # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815873 - /tomcat/native/trunk/jnirelease.sh
Author: rjung
Date: Wed Sep 16 16:48:02 2009
New Revision: 815873
URL: http://svn.apache.org/viewvc?rev=815873view=rev
Log:
Update jni release script for trunk.
It will still not work, because
all the java files (sources, build.*) are missing.
Modified:
tomcat/native/trunk/jnirelease.sh
Modified: tomcat/native/trunk/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=815873r1=815872r2=815873view=diff
==
--- tomcat/native/trunk/jnirelease.sh (original)
+++ tomcat/native/trunk/jnirelease.sh Wed Sep 16 16:48:02 2009
@@ -20,7 +20,7 @@
apr_src_dir=`pwd`/srclib/apr
JKJNIEXT=
JKJNIVER=
-SVNBASE=https://svn.apache.org/repos/asf/tomcat/connectors/
+SVNBASE=https://svn.apache.org/repos/asf/tomcat/native/
for o
do
@@ -104,32 +104,37 @@
JKJNIDIST=tomcat-native-${JKJNIVER}-src
rm -rf ${JKJNIDIST}
-mkdir -p ${JKJNIDIST}/jni
-for i in native java xdocs examples test build.xml build.properties.sample
+
+#
+# XXX FIXME: we still need
+# examples test build.xml build.properties.default
+# which are gone in tcnative trunk at the moment
+#
+
+svn export $SVNBASE/${JKJNIEXT} ${JKJNIDIST}
+if [ $? -ne 0 ]; then
+echo svn export failed
+exit 1
+fi
+
+# Clean up unused stuff
+for i in jnirelease.sh
do
-svn export $SVNBASE/${JKJNIEXT}/jni/${i} ${JKJNIDIST}/jni/${i}
-if [ $? -ne 0 ]; then
-echo svn export ${i} failed
-exit 1
-fi
+rm -rf ${JKJNIDIST}/${i}
done
top=`pwd`
-cd ${JKJNIDIST}/jni/xdocs
+cd ${JKJNIDIST}/xdocs
ant
-$EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html
../../CHANGELOG.txt 2/dev/null
+$EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html
../CHANGELOG.txt 2/dev/null
cd $top
-rm -rf ${JKJNIDIST}/jni/xdocs
-
-svn cat $SVNBASE/${JKJNIEXT}/KEYS ${JKJNIDIST}/KEYS
-svn cat $SVNBASE/${JKJNIEXT}/LICENSE ${JKJNIDIST}/LICENSE
-svn cat $SVNBASE/${JKJNIEXT}/NOTICE ${JKJNIDIST}/NOTICE
-svn cat $SVNBASE/${JKJNIEXT}/jni/NOTICE.txt ${JKJNIDIST}/NOTICE.txt
-svn cat $SVNBASE/${JKJNIEXT}/jni/README.txt ${JKJNIDIST}/README.txt
+rm -rf ${JKJNIDIST}/xdocs
+mv ${JKJNIDIST}/build/docs ${JKJNIDIST}/docs
+rm -rf ${JKJNIDIST}/build
#
# Prebuild
-cd ${JKJNIDIST}/jni/native
+cd ${JKJNIDIST}/native
./buildconf --with-apr=$apr_src_dir
cd $top
# Create source distribution
@@ -138,12 +143,11 @@
# Create Win32 source distribution
JKWINDIST=tomcat-native-${JKJNIVER}-win32-src
rm -rf ${JKWINDIST}
-mkdir -p ${JKWINDIST}/jni
-svn export --native-eol CRLF $SVNBASE/${JKJNIEXT}/jni/native
${JKWINDIST}/jni/native
+mkdir -p ${JKWINDIST}
+svn export --native-eol CRLF $SVNBASE/${JKJNIEXT}/native ${JKWINDIST}/native
svn cat $SVNBASE/${JKJNIEXT}/KEYS ${JKWINDIST}/KEYS
svn cat $SVNBASE/${JKJNIEXT}/LICENSE ${JKWINDIST}/LICENSE
svn cat $SVNBASE/${JKJNIEXT}/NOTICE ${JKWINDIST}/NOTICE
-svn cat $SVNBASE/${JKJNIEXT}/jni/NOTICE.txt ${JKWINDIST}/NOTICE.txt
-svn cat $SVNBASE/${JKJNIEXT}/jni/README.txt ${JKWINDIST}/README.txt
+svn cat $SVNBASE/${JKJNIEXT}/README.txt ${JKWINDIST}/README.txt
cp ${JKJNIDIST}/CHANGELOG.txt ${JKWINDIST}/
zip -9rqyo ${JKWINDIST}.zip ${JKWINDIST}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815877 - /tomcat/native/trunk/README.txt
Author: rjung Date: Wed Sep 16 16:54:01 2009 New Revision: 815877 URL: http://svn.apache.org/viewvc?rev=815877view=rev Log: At least change wording to something that's true, although not really helpful right now. Modified: tomcat/native/trunk/README.txt Modified: tomcat/native/trunk/README.txt URL: http://svn.apache.org/viewvc/tomcat/native/trunk/README.txt?rev=815877r1=815876r2=815877view=diff == --- tomcat/native/trunk/README.txt (original) +++ tomcat/native/trunk/README.txt Wed Sep 16 16:54:01 2009 @@ -13,8 +13,9 @@ See the License for the specific language governing permissions and limitations under the License. -This directory contains both the native and java-side code for -Tomcat Native Library. +This directory contains the native code for the Tomcat Native Library. +The Java code is part of the Tomcat source code. All classes +are located in the org.apache.tomcat.jni package. Building - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815879 - in /tomcat/native/branches/1.1.x: build.properties.default build.properties.sample jnirelease.sh
Author: rjung
Date: Wed Sep 16 16:58:13 2009
New Revision: 815879
URL: http://svn.apache.org/viewvc?rev=815879view=rev
Log:
Switch from build.properties.sample (old style)
to build.properties.default.
Added:
tomcat/native/branches/1.1.x/build.properties.default (props changed)
- copied unchanged from r815814,
tomcat/native/branches/1.1.x/build.properties.sample
Removed:
tomcat/native/branches/1.1.x/build.properties.sample
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Propchange: tomcat/native/branches/1.1.x/build.properties.default
--
svn:eol-style = native
Propchange: tomcat/native/branches/1.1.x/build.properties.default
--
svn:keywords = Author Date Id Revision
Propchange: tomcat/native/branches/1.1.x/build.properties.default
--
svn:mergeinfo = /tomcat/native/trunk/build.properties.sample:815411
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=815879r1=815878r2=815879view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Wed Sep 16 16:58:13 2009
@@ -105,7 +105,7 @@
rm -rf ${JKJNIDIST}
mkdir -p ${JKJNIDIST}/jni
-for i in native java xdocs examples test build.xml build.properties.sample
+for i in native java xdocs examples test build.xml build.properties.default
do
svn export $SVNBASE/${JKJNIEXT}/jni/${i} ${JKJNIDIST}/jni/${i}
if [ $? -ne 0 ]; then
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815883 - in /tomcat/native/branches/1.1.x: build.properties.default build.xml
Author: rjung
Date: Wed Sep 16 17:00:48 2009
New Revision: 815883
URL: http://svn.apache.org/viewvc?rev=815883view=rev
Log:
Pick up modern build.xml from tc5.5.x jni.
- better support for build.properties
- handling version numbers
- careing about charset when filtering
Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/build.xml
Modified: tomcat/native/branches/1.1.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=815883r1=815882r2=815883view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Wed Sep 16 17:00:48
2009
@@ -1,3 +1,27 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the License); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an AS IS BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# - Vesion Control Flags -
+version.major=1
+version.minor=1
+version.build=17
+version.patch=0
+version.suffix=-dev
+
# The directory containing your binary distribution of JUnit,
# version 3.8 or later
junit.home = /usr/local/java/junit3.8.1
Modified: tomcat/native/branches/1.1.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=815883r1=815882r2=815883view=diff
==
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Wed Sep 16 17:00:48 2009
@@ -22,20 +22,35 @@
--
property file=${user.home}/.ant.properties /
property file=${user.home}/build.properties /
-property file=build.properties /
property file=.ant.properties /
+property file=build.properties /
+property file=build.properties.default/
!-- Initialization properties --
-property name=name value=Tomcat Native/
-property name=title value=Tomcat Native Library/
-property name=version value=1.0.0/
-property name=version.number value=100/
-property name=project value=tomcat-native/
+property name=project value=tomcat-native /
+property name=name value=Tomcat Native /
+property name=title value=Tomcat Native Library/
+property name=year value=2009 /
+property name=version.major value=1 /
+property name=version.minor value=1 /
+property name=version.build value=17 /
+property name=version.patch value=0 /
+property name=version.suffixvalue=-dev /
+
+property name=junit.homevalue=/usr/local/junit3.8/
+property name=junit.jar value=${junit.home}/junit.jar/
+property name=test.runner value=junit.textui.TestRunner/
+
+property name=version
value=${version.major}.${version.minor}.${version.build}${version.suffix} /
+property name=version.number
value=${version.major}.${version.minor}.${version.build}.${version.patch} /
+property name=version.major.minor
value=${version.major}.${version.minor} /
+
+property name=final.namevalue=${project}-${version} /
+
property name=build.dir value=./dist/
property name=build.src value=${build.dir}/src/
property name=build.dest value=${build.dir}/classes/
property name=src.dir value=./
-property name=final.name value=${project}-${version}/
property name=dist.root value=./dist/
property name=ant.home value=./
@@ -46,15 +61,13 @@
property name=docs.src value=./xdocs/
property name=docs.dest value=${dist.root}/doc/
property name=docs.dest.print value=${dist.root}/doc/printable/
-property name=test.runner value=junit.textui.TestRunner/
property name=test.dir value=${build.dest}/test/
property name=examples.dir value=${build.dest}/examples/
-property name=junit.home value=/usr/local/junit3.8/
-property name=junit.jar value=${junit.home}/junit.jar/
+
property name=tc.library.path value=${basedir}/native/.libs/
- !-- The base directory for component sources --
- property name=source.home value=java/
+!-- The base directory for component sources --
+property
svn commit: r815888 - /tomcat/native/branches/1.1.x/KEYS
Author: rjung Date: Wed Sep 16 17:05:12 2009 New Revision: 815888 URL: http://svn.apache.org/viewvc?rev=815888view=rev Log: Copy native KEYS from trunk to branch. Added: tomcat/native/branches/1.1.x/KEYS - copied unchanged from r815886, tomcat/native/trunk/KEYS - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815889 - /tomcat/native/branches/1.1.x/LICENSE
Author: rjung Date: Wed Sep 16 17:05:56 2009 New Revision: 815889 URL: http://svn.apache.org/viewvc?rev=815889view=rev Log: Copy native LICENSE from trunk to branch. Added: tomcat/native/branches/1.1.x/LICENSE - copied unchanged from r815888, tomcat/native/trunk/LICENSE - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815895 - in /tomcat/native/branches/1.1.x: NOTICE NOTICE.txt
Author: rjung Date: Wed Sep 16 17:21:11 2009 New Revision: 815895 URL: http://svn.apache.org/viewvc?rev=815895view=rev Log: Switch over to default notation NOTICE instead of NOTICE.txt Added: tomcat/native/branches/1.1.x/NOTICE (props changed) - copied unchanged from r815814, tomcat/native/branches/1.1.x/NOTICE.txt Removed: tomcat/native/branches/1.1.x/NOTICE.txt Propchange: tomcat/native/branches/1.1.x/NOTICE -- svn:eol-style = native Propchange: tomcat/native/branches/1.1.x/NOTICE -- svn:keywords = Author Date Id Revision Propchange: tomcat/native/branches/1.1.x/NOTICE -- svn:mergeinfo = /tomcat/native/trunk/NOTICE.txt:815411 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815899 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Wed Sep 16 17:26:17 2009
New Revision: 815899
URL: http://svn.apache.org/viewvc?rev=815899view=rev
Log:
Update jnirelease.sh to make it work after
svn reorg.
Adds new --ver=1.1.x for building from branch.
Caution: The windows src zip has very different
contents from the Unix tarball (not only the line
endings are different). This is not new.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=815899r1=815898r2=815899view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Wed Sep 16 17:26:17 2009
@@ -20,7 +20,7 @@
apr_src_dir=`pwd`/srclib/apr
JKJNIEXT=
JKJNIVER=
-SVNBASE=https://svn.apache.org/repos/asf/tomcat/connectors/
+SVNBASE=https://svn.apache.org/repos/asf/tomcat/native/
for o
do
@@ -64,7 +64,7 @@
echo
echo Unknown SVN version
echo Use:
-echo --ver=version|trunk
+echo --ver=version|branch|trunk
echo
exit 1
fi
@@ -91,13 +91,20 @@
exit 1
fi
-echo Using SVN repo : \`$SVNBASE/${JKJNIEXT}'
+echo $JKJNIEXT | egrep -e 'x$' /dev/null 21
+NOT_A_BRANCH=$0
+
if [ x$JKJNIEXT = xtrunk ]; then
-JKJNIVER=`svn info $SVNBASE | awk '$1 == Revision: {print $2}'`
+JKJNIVER=`svn info $SVNBASE/${JKJNIEXT} | awk '$1 == Revision: {print
$2}'`
+elif [ $NOT_A_BRANCH -eq 0 ]; then
+JKJNIVER=$JKJNIEXT
+JKJNIEXT=branches/${JKJNIEXT}
+JKJNIVER=${JKJNIVER}-`svn info $SVNBASE/${JKJNIEXT} | awk '$1 ==
Revision: {print $2}'`
else
JKJNIVER=$JKJNIEXT
-JKJNIEXT=tags/other/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`
+JKJNIEXT=tags/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`
fi
+echo Using SVN repo : \`$SVNBASE/${JKJNIEXT}'
echo Using version: \`${JKJNIVER}'
@@ -107,7 +114,7 @@
mkdir -p ${JKJNIDIST}/jni
for i in native java xdocs examples test build.xml build.properties.default
do
-svn export $SVNBASE/${JKJNIEXT}/jni/${i} ${JKJNIDIST}/jni/${i}
+svn export $SVNBASE/${JKJNIEXT}/${i} ${JKJNIDIST}/jni/${i}
if [ $? -ne 0 ]; then
echo svn export ${i} failed
exit 1
@@ -120,12 +127,12 @@
$EXPTOOL $EXPOPTS ../build/docs/miscellaneous/printer/changelog.html
../../CHANGELOG.txt 2/dev/null
cd $top
rm -rf ${JKJNIDIST}/jni/xdocs
-
+mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
+rm -rf ${JKJNIDIST}/jni/build
svn cat $SVNBASE/${JKJNIEXT}/KEYS ${JKJNIDIST}/KEYS
svn cat $SVNBASE/${JKJNIEXT}/LICENSE ${JKJNIDIST}/LICENSE
svn cat $SVNBASE/${JKJNIEXT}/NOTICE ${JKJNIDIST}/NOTICE
-svn cat $SVNBASE/${JKJNIEXT}/jni/NOTICE.txt ${JKJNIDIST}/NOTICE.txt
-svn cat $SVNBASE/${JKJNIEXT}/jni/README.txt ${JKJNIDIST}/README.txt
+svn cat $SVNBASE/${JKJNIEXT}/README.txt ${JKJNIDIST}/README.txt
#
# Prebuild
@@ -139,11 +146,10 @@
JKWINDIST=tomcat-native-${JKJNIVER}-win32-src
rm -rf ${JKWINDIST}
mkdir -p ${JKWINDIST}/jni
-svn export --native-eol CRLF $SVNBASE/${JKJNIEXT}/jni/native
${JKWINDIST}/jni/native
+svn export --native-eol CRLF $SVNBASE/${JKJNIEXT}/native
${JKWINDIST}/jni/native
svn cat $SVNBASE/${JKJNIEXT}/KEYS ${JKWINDIST}/KEYS
svn cat $SVNBASE/${JKJNIEXT}/LICENSE ${JKWINDIST}/LICENSE
svn cat $SVNBASE/${JKJNIEXT}/NOTICE ${JKWINDIST}/NOTICE
-svn cat $SVNBASE/${JKJNIEXT}/jni/NOTICE.txt ${JKWINDIST}/NOTICE.txt
-svn cat $SVNBASE/${JKJNIEXT}/jni/README.txt ${JKWINDIST}/README.txt
+svn cat $SVNBASE/${JKJNIEXT}/README.txt ${JKWINDIST}/README.txt
cp ${JKJNIDIST}/CHANGELOG.txt ${JKWINDIST}/
zip -9rqyo ${JKWINDIST}.zip ${JKWINDIST}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815904 - /tomcat/native/branches/1.1.x/jnirelease.sh
Author: rjung
Date: Wed Sep 16 17:39:57 2009
New Revision: 815904
URL: http://svn.apache.org/viewvc?rev=815904view=rev
Log:
Fix use of jni release script for branches.
Also simply some variables.
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=815904r1=815903r2=815904view=diff
==
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Wed Sep 16 17:39:57 2009
@@ -20,7 +20,7 @@
apr_src_dir=`pwd`/srclib/apr
JKJNIEXT=
JKJNIVER=
-SVNBASE=https://svn.apache.org/repos/asf/tomcat/native/
+SVNBASE=https://svn.apache.org/repos/asf/tomcat/native
for o
do
@@ -92,19 +92,24 @@
fi
echo $JKJNIEXT | egrep -e 'x$' /dev/null 21
-NOT_A_BRANCH=$0
+if [ $? -eq 0 ]; then
+USE_BRANCH=1
+else
+USE_BRANCH=0
+fi
+JKJNISVN=$SVNBASE/${JKJNIEXT}
if [ x$JKJNIEXT = xtrunk ]; then
-JKJNIVER=`svn info $SVNBASE/${JKJNIEXT} | awk '$1 == Revision: {print
$2}'`
-elif [ $NOT_A_BRANCH -eq 0 ]; then
-JKJNIVER=$JKJNIEXT
-JKJNIEXT=branches/${JKJNIEXT}
-JKJNIVER=${JKJNIVER}-`svn info $SVNBASE/${JKJNIEXT} | awk '$1 ==
Revision: {print $2}'`
+JKJNIVER=`svn info ${JKJNISVN} | awk '$1 == Revision: {print $2}'`
+elif [ $USE_BRANCH -eq 1 ]; then
+JKJNIBRANCH=${JKJNIEXT}
+JKJNISVN=$SVNBASE/branches/${JKJNIBRANCH}
+JKJNIVER=${JKJNIBRANCH}-`svn info ${JKJNISVN} | awk '$1 == Revision:
{print $2}'`
else
JKJNIVER=$JKJNIEXT
-JKJNIEXT=tags/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`
+JKJNISVN=${SVNBASE}/tags/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`
fi
-echo Using SVN repo : \`$SVNBASE/${JKJNIEXT}'
+echo Using SVN repo : \`${JKJNISVN}'
echo Using version: \`${JKJNIVER}'
@@ -114,7 +119,7 @@
mkdir -p ${JKJNIDIST}/jni
for i in native java xdocs examples test build.xml build.properties.default
do
-svn export $SVNBASE/${JKJNIEXT}/${i} ${JKJNIDIST}/jni/${i}
+svn export ${JKJNISVN}/${i} ${JKJNIDIST}/jni/${i}
if [ $? -ne 0 ]; then
echo svn export ${i} failed
exit 1
@@ -129,10 +134,10 @@
rm -rf ${JKJNIDIST}/jni/xdocs
mv ${JKJNIDIST}/jni/build/docs ${JKJNIDIST}/jni/docs
rm -rf ${JKJNIDIST}/jni/build
-svn cat $SVNBASE/${JKJNIEXT}/KEYS ${JKJNIDIST}/KEYS
-svn cat $SVNBASE/${JKJNIEXT}/LICENSE ${JKJNIDIST}/LICENSE
-svn cat $SVNBASE/${JKJNIEXT}/NOTICE ${JKJNIDIST}/NOTICE
-svn cat $SVNBASE/${JKJNIEXT}/README.txt ${JKJNIDIST}/README.txt
+svn cat ${JKJNISVN}/KEYS ${JKJNIDIST}/KEYS
+svn cat ${JKJNISVN}/LICENSE ${JKJNIDIST}/LICENSE
+svn cat ${JKJNISVN}/NOTICE ${JKJNIDIST}/NOTICE
+svn cat ${JKJNISVN}/README.txt ${JKJNIDIST}/README.txt
#
# Prebuild
@@ -146,10 +151,10 @@
JKWINDIST=tomcat-native-${JKJNIVER}-win32-src
rm -rf ${JKWINDIST}
mkdir -p ${JKWINDIST}/jni
-svn export --native-eol CRLF $SVNBASE/${JKJNIEXT}/native
${JKWINDIST}/jni/native
-svn cat $SVNBASE/${JKJNIEXT}/KEYS ${JKWINDIST}/KEYS
-svn cat $SVNBASE/${JKJNIEXT}/LICENSE ${JKWINDIST}/LICENSE
-svn cat $SVNBASE/${JKJNIEXT}/NOTICE ${JKWINDIST}/NOTICE
-svn cat $SVNBASE/${JKJNIEXT}/README.txt ${JKWINDIST}/README.txt
+svn export --native-eol CRLF ${JKJNISVN}/native ${JKWINDIST}/jni/native
+svn cat ${JKJNISVN}/KEYS ${JKWINDIST}/KEYS
+svn cat ${JKJNISVN}/LICENSE ${JKWINDIST}/LICENSE
+svn cat ${JKJNISVN}/NOTICE ${JKWINDIST}/NOTICE
+svn cat ${JKJNISVN}/README.txt ${JKWINDIST}/README.txt
cp ${JKJNIDIST}/CHANGELOG.txt ${JKWINDIST}/
zip -9rqyo ${JKWINDIST}.zip ${JKWINDIST}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815949 - /tomcat/native/trunk/test/
Author: rjung Date: Wed Sep 16 20:19:24 2009 New Revision: 815949 URL: http://svn.apache.org/viewvc?rev=815949view=rev Log: Get back jni test classes for native trunk. Copy over from tc5.5 connectors. Added: tomcat/native/trunk/test/ - copied from r815948, tomcat/tc5.5.x/trunk/connectors/jni/test/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815950 - /tomcat/native/trunk/examples/
Author: rjung Date: Wed Sep 16 20:20:12 2009 New Revision: 815950 URL: http://svn.apache.org/viewvc?rev=815950view=rev Log: Get back jni examples classes for native trunk. Copy over from tc5.5 connectors. Added: tomcat/native/trunk/examples/ - copied from r815949, tomcat/tc5.5.x/trunk/connectors/jni/examples/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815954 - /tomcat/native/trunk/build.properties.default
Author: rjung Date: Wed Sep 16 20:31:11 2009 New Revision: 815954 URL: http://svn.apache.org/viewvc?rev=815954view=rev Log: Recover native build.properties.default for trunk from 1.1.x branch. Added: tomcat/native/trunk/build.properties.default (props changed) - copied unchanged from r815953, tomcat/native/branches/1.1.x/build.properties.default Propchange: tomcat/native/trunk/build.properties.default -- svn:eol-style = native Propchange: tomcat/native/trunk/build.properties.default -- svn:keywords = Author Date Id Revision Propchange: tomcat/native/trunk/build.properties.default -- svn:mergeinfo = /tomcat/native/trunk/build.properties.sample:815411 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815955 - /tomcat/native/trunk/build.xml
Author: rjung Date: Wed Sep 16 20:32:03 2009 New Revision: 815955 URL: http://svn.apache.org/viewvc?rev=815955view=rev Log: Recover native build.xml for trunk from 1.1.x branch. Added: tomcat/native/trunk/build.xml (props changed) - copied unchanged from r815954, tomcat/native/branches/1.1.x/build.xml Propchange: tomcat/native/trunk/build.xml -- svn:eol-style = native Propchange: tomcat/native/trunk/build.xml -- svn:keywords = Author Date Id Revision Propchange: tomcat/native/trunk/build.xml -- svn:mergeinfo = /tomcat/native/trunk/build.xml:815411 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815983 - in /tomcat/native/trunk: build.properties.default build.xml
Author: rjung
Date: Wed Sep 16 21:55:29 2009
New Revision: 815983
URL: http://svn.apache.org/viewvc?rev=815983view=rev
Log:
Improve build.xml and build.properties.default
for native trunk:
- Add properties for javac settings
- Add properties for downloading Tomcat src and Junit
- Add download tasks from Tomcat trunk
- Add task descriptions
- Copy Java source files form Tomcat download
during build
- remove task compile-only
- remove task examples and keep only compile-examples
- rename the tasks for running examples in
order to make output of ant -p a little more ordered
Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/build.xml
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=815983r1=815982r2=815983view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Wed Sep 16 21:55:29 2009
@@ -28,3 +28,34 @@
# The pathname of the junit.jar JAR file
junit.jar = ${junit.home}/junit.jar
+
+# - Default Base Path for Dependent Packages -
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+base.path=/usr/share/java
+#base.path=C:/path/to/the/repository
+#base.path=/usr/local
+
+compile.source=1.4
+compile.target=1.4
+compile.debug=off
+compile.deprecation=on
+compile.optimize=on
+
+base-tomcat.loc=http://archive.apache.org/dist/tomcat
+base-sf.loc=http://downloads.sourceforge.net
+
+# - Tomcat native Java sources -
+tomcat.version=6.0.20
+tomcat.home=${base.path}/tomcat-${tomcat.version}
+tomcat.tar.gz=${tomcat.home}/tomcat.tar.gz
+tomcat.loc=${base-tomcat.loc}/tomcat-6/v${tomcat.version}/src/apache-tomcat-${tomcat.version}-src.tar.gz
+tomcat.src=${base.path}/apache-tomcat-${tomcat.version}-src
+
+# - JUnit Unit Test Suite, version 3.7 or later -
+junit.home=${base.path}/junit3.8.2
+junit.lib=${junit.home}
+junit.jar=${junit.lib}/junit.jar
+junit.loc=${base-sf.loc}/junit/junit3.8.2.zip
+
Modified: tomcat/native/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=815983r1=815982r2=815983view=diff
==
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Wed Sep 16 21:55:29 2009
@@ -54,9 +54,11 @@
property name=dist.root value=./dist/
property name=ant.home value=./
-property name=debug value=off/
-property name=optimize value=on/
-property name=deprecation value=on/
+property name=compile.source value=1.4/
+property name=compile.target value=1.4/
+property name=compile.debug value=off/
+property name=compile.optimize value=on/
+property name=compile.deprecation value=on/
property name=docs.src value=./xdocs/
property name=docs.dest value=${dist.root}/doc/
@@ -104,6 +106,65 @@
mkdir dir=${build.dir}/
/target
+!-- Download and dependency building --
+target name=proxyflags
+ !-- check proxy parameters. --
+ condition property=useproxy
+equals arg1=${proxy.use} arg2=on /
+ /condition
+/target
+
+target name=setproxy depends=proxyflags if=useproxy
+ taskdef name=setproxy
+ classname=org.apache.tools.ant.taskdefs.optional.net.SetProxy
/
+ setproxy proxyhost=${proxy.host} proxyport=${proxy.port}
+proxyuser=${proxy.user} proxypassword=${proxy.password} /
+ echo message=Using ${proxy.host}:${proxy.port} to download
${sourcefile}/
+/target
+
+target name=testexist
+ echo message=Testing for ${destfile}/
+ available file=${destfile} property=exist/
+/target
+
+target name=downloadgz unless=exist depends=setproxy,testexist
+ !-- Download and extract the package --
+ get src=${sourcefile} dest=${base.path}/file.tar.gz /
+ gunzip src=${base.path}/file.tar.gz dest=${base.path}/file.tar/
+ untar src=${base.path}/file.tar dest=${base.path}/
+ delete file=${base.path}/file.tar/
+ delete file=${base.path}/file.tar.gz/
+/target
+
+target name=downloadzip unless=exist depends=setproxy,testexist
+ !-- Download and extract the package --
+ get src=${sourcefile} dest=${base.path}/file.zip /
+ mkdir dir=${destdir} /
+ unzip src=${base.path}/file.zip dest=${destdir}/
+ delete file=${base.path}/file.zip/
+/target
+
+target name=downloadfile unless=exist depends=setproxy,testexist
+ !-- Download extract the file --
+ mkdir dir=${destdir} /
+ get src=${sourcefile} dest=${destfile} /
+/target
+
+target name=download description=Download needed dependencies
+
+ mkdir dir=${base.path}/
+ antcall target=downloadgz
+param name=sourcefile
svn commit: r815985 - /tomcat/native/trunk/build.properties.default
Author: rjung
Date: Wed Sep 16 22:06:59 2009
New Revision: 815985
URL: http://svn.apache.org/viewvc?rev=815985view=rev
Log:
Remove unused properties, add some comments.
Modified:
tomcat/native/trunk/build.properties.default
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=815985r1=815984r2=815985view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Wed Sep 16 22:06:59 2009
@@ -22,13 +22,6 @@
version.patch=0
version.suffix=-dev
-# The directory containing your binary distribution of JUnit,
-# version 3.8 or later
-junit.home = /usr/local/java/junit3.8.1
-
-# The pathname of the junit.jar JAR file
-junit.jar = ${junit.home}/junit.jar
-
# - Default Base Path for Dependent Packages -
# Please note this path must be absolute, not relative,
# as it is referenced with different working directory
@@ -47,15 +40,23 @@
base-sf.loc=http://downloads.sourceforge.net
# - Tomcat native Java sources -
+# The Tomcat 6 version we use for getting the Java sources
tomcat.version=6.0.20
-tomcat.home=${base.path}/tomcat-${tomcat.version}
-tomcat.tar.gz=${tomcat.home}/tomcat.tar.gz
-tomcat.loc=${base-tomcat.loc}/tomcat-6/v${tomcat.version}/src/apache-tomcat-${tomcat.version}-src.tar.gz
+# The directory containing your source distribution of Tomcat
+# It will be automatically downloaded if it doesn't exist
tomcat.src=${base.path}/apache-tomcat-${tomcat.version}-src
+#tomcat.src=/usr/local/apache-tomcat-${tomcat.version}-src
+# The URL used to download Tomcat if needed
+tomcat.loc=${base-tomcat.loc}/tomcat-6/v${tomcat.version}/src/apache-tomcat-${tomcat.version}-src.tar.gz
-# - JUnit Unit Test Suite, version 3.7 or later -
-junit.home=${base.path}/junit3.8.2
-junit.lib=${junit.home}
-junit.jar=${junit.lib}/junit.jar
-junit.loc=${base-sf.loc}/junit/junit3.8.2.zip
-
+# - JUnit Unit Test Suite, version 3.8 or later -
+# The JUnit version we will use
+junit.version=3.8.2
+# The directory containing your binary distribution of JUnit
+# It will be automatically downloaded if it doesn't exist
+junit.home=${base.path}/junit${junit.version}
+#junit.home = /usr/local/java/junit3.8.1
+# The pathname of the junit.jar JAR file
+junit.jar=${junit.home}/junit.jar
+# The URL used to download JUnit if needed
+junit.loc=${base-sf.loc}/junit/junit${junit.version}.zip
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815986 - /tomcat/native/trunk/build.properties.default
Author: rjung Date: Wed Sep 16 22:09:20 2009 New Revision: 815986 URL: http://svn.apache.org/viewvc?rev=815986view=rev Log: Fix typo in comment. Modified: tomcat/native/trunk/build.properties.default Modified: tomcat/native/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=815986r1=815985r2=815986view=diff == --- tomcat/native/trunk/build.properties.default (original) +++ tomcat/native/trunk/build.properties.default Wed Sep 16 22:09:20 2009 @@ -15,7 +15,7 @@ # limitations under the License. # -# - Vesion Control Flags - +# - Version Control Flags - version.major=2 version.minor=0 version.build=0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815989 - in /tomcat/native/branches/1.1.x: build.properties.default build.xml
Author: rjung
Date: Wed Sep 16 22:24:43 2009
New Revision: 815989
URL: http://svn.apache.org/viewvc?rev=815989view=rev
Log:
Backport some build changes from trunk
(r815983+r815985+r815986)
- Add properties for javac settings
- Add properties for downloading Junit
- Add download tasks from Tomcat trunk
- Add task descriptions
- remove task compile-only
- remove task examples and keep only compile-examples
- rename the tasks for running examples in
order to make output of ant -p a little more ordered
Modified:
tomcat/native/branches/1.1.x/build.properties.default
tomcat/native/branches/1.1.x/build.xml
Modified: tomcat/native/branches/1.1.x/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.properties.default?rev=815989r1=815988r2=815989view=diff
==
--- tomcat/native/branches/1.1.x/build.properties.default (original)
+++ tomcat/native/branches/1.1.x/build.properties.default Wed Sep 16 22:24:43
2009
@@ -15,16 +15,38 @@
# limitations under the License.
#
-# - Vesion Control Flags -
+# - Version Control Flags -
version.major=1
version.minor=1
version.build=17
version.patch=0
version.suffix=-dev
-# The directory containing your binary distribution of JUnit,
-# version 3.8 or later
-junit.home = /usr/local/java/junit3.8.1
+# - Default Base Path for Dependent Packages -
+# Please note this path must be absolute, not relative,
+# as it is referenced with different working directory
+# contexts by the various build scripts.
+base.path=/usr/share/java
+#base.path=C:/path/to/the/repository
+#base.path=/usr/local
+compile.source=1.4
+compile.target=1.4
+compile.debug=off
+compile.deprecation=on
+compile.optimize=on
+
+base-tomcat.loc=http://archive.apache.org/dist/tomcat
+base-sf.loc=http://downloads.sourceforge.net
+
+# - JUnit Unit Test Suite, version 3.8 or later -
+# The JUnit version we will use
+junit.version=3.8.2
+# The directory containing your binary distribution of JUnit
+# It will be automatically downloaded if it doesn't exist
+junit.home=${base.path}/junit${junit.version}
+#junit.home = /usr/local/java/junit3.8.1
# The pathname of the junit.jar JAR file
-junit.jar = ${junit.home}/junit.jar
+junit.jar=${junit.home}/junit.jar
+# The URL used to download JUnit if needed
+junit.loc=${base-sf.loc}/junit/junit${junit.version}.zip
Modified: tomcat/native/branches/1.1.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/build.xml?rev=815989r1=815988r2=815989view=diff
==
--- tomcat/native/branches/1.1.x/build.xml (original)
+++ tomcat/native/branches/1.1.x/build.xml Wed Sep 16 22:24:43 2009
@@ -54,9 +54,11 @@
property name=dist.root value=./dist/
property name=ant.home value=./
-property name=debug value=off/
-property name=optimize value=on/
-property name=deprecation value=on/
+property name=compile.source value=1.4/
+property name=compile.target value=1.4/
+property name=compile.debug value=off/
+property name=compile.optimize value=on/
+property name=compile.deprecation value=on/
property name=docs.src value=./xdocs/
property name=docs.dest value=${dist.root}/doc/
@@ -104,6 +106,61 @@
mkdir dir=${build.dir}/
/target
+!-- Download and dependency building --
+target name=proxyflags
+ !-- check proxy parameters. --
+ condition property=useproxy
+equals arg1=${proxy.use} arg2=on /
+ /condition
+/target
+
+target name=setproxy depends=proxyflags if=useproxy
+ taskdef name=setproxy
+ classname=org.apache.tools.ant.taskdefs.optional.net.SetProxy
/
+ setproxy proxyhost=${proxy.host} proxyport=${proxy.port}
+proxyuser=${proxy.user} proxypassword=${proxy.password} /
+ echo message=Using ${proxy.host}:${proxy.port} to download
${sourcefile}/
+/target
+
+target name=testexist
+ echo message=Testing for ${destfile}/
+ available file=${destfile} property=exist/
+/target
+
+target name=downloadgz unless=exist depends=setproxy,testexist
+ !-- Download and extract the package --
+ get src=${sourcefile} dest=${base.path}/file.tar.gz /
+ gunzip src=${base.path}/file.tar.gz dest=${base.path}/file.tar/
+ untar src=${base.path}/file.tar dest=${base.path}/
+ delete file=${base.path}/file.tar/
+ delete file=${base.path}/file.tar.gz/
+/target
+
+target name=downloadzip unless=exist depends=setproxy,testexist
+ !-- Download and extract the package --
+ get src=${sourcefile} dest=${base.path}/file.zip /
+ mkdir dir=${destdir} /
+ unzip src=${base.path}/file.zip dest=${destdir}/
+ delete file=${base.path}/file.zip/
+/target
+
+target name=downloadfile unless=exist depends=setproxy,testexist
+ !-- Download
