svn commit: r815657 - /tomcat/trunk/build.xml
Author: markt
Date: Wed Sep 16 08:09:08 2009
New Revision: 815657
URL: http://svn.apache.org/viewvc?rev=815657&view=rev
Log:
Use defaults where appropriate for jarIt macro
A couple of minor packaging tweaks
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=815657&r1=815656&r2=815657&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Sep 16 08:09:08 2009
@@ -217,7 +217,6 @@
-
@@ -225,7 +224,7 @@
-
+
@@ -299,9 +298,12 @@
-
-
-
+
+
+
@@ -336,10 +338,7 @@
+ filesId="files.annotations-api" />
+ filesId="files.el-api" />
+ manifest="${tomcat.tmp}/bootstrap.jar.manifest" />
+ filesId="files.tomcat-juli" />
+ filesId="files.catalina" />
+ filesId="files.catalina-tribes" />
+ filesId="files.catalina-ha" />
+ filesId="files.catalina-ant" />
+ filesId="files.tomcat-api" />
+ filesId="files.tomcat-coyote" />
+ filesId="files.jasper" />
+ filesId="files.jasper-el" />
+ filesId="files.tomcat-embed-jasper"/>
+ filesId="files.tomcat-juli"/>
@@ -761,22 +721,13 @@
+ filesId="files.tomcat-embed-core"/>
+ filesId="files.tomcat-embed-jasper"/>
+ filesId="files.tomcat-juli"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
what does j_security_check do in clustering?
Dear Tomcat devs, I meet a problem when config a web project which using the form based security in clustering. When I set session affinity = true in my front http server, the security check was done in single node, there is no problem with that. But if I set affinity = false, the requests from the security check process are sent to 2 nodes, and it is really strange.. eg: 1. From index.html(NodeA), try to access protected resouce 2. Go to the logon.html(NodeB), I input the id/passwd, and then submit 3. The request looks like sent to NodeA, but did not do any check operation. Does that work as design? that is, if I wanna use form check security, my cluster must be session affinity? Thanks in advance! -Rex
Re: what does j_security_check do in clustering?
Rex Wang wrote: > Dear Tomcat devs, > > I meet a problem when config a web project which using the form based > security in clustering. > > When I set session affinity = true in my front http server, the security > check was done in single node, there is no problem with that. > But if I set affinity = false, the requests from the security check process > are sent to 2 nodes, and it is really strange.. eg: > > 1. From index.html(NodeA), try to access protected resouce > 2. Go to the logon.html(NodeB), I input the id/passwd, and then submit > 3. The request looks like sent to NodeA, but did not do any check operation. > > Does that work as design? that is, if I wanna use form check security, my > cluster must be session affinity? That would be a question for the users list. Mark - 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=815726&view=rev Log: Recover tcnative STATUS file removed during svn reorg. See also http://marc.info/?t=12480793816&r=1&w=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
tcnative 1.1.x CTR or RTC
Is tcnative 1.1.x CTR or RTC? We once had a status file, which was lost during the svn reorg. I recovered it. There are a couple of simple fixes sitting in there and waiting for a vote, but if we are still RTC, I would like to apply them before 1.1.17. I was just wondering because of Marks backports yesterday. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: tcnative 1.1.x CTR or RTC
Rainer Jung wrote: > Is tcnative 1.1.x CTR or RTC? I thought CTR - if that was wrong then I apologise. > We once had a status file, which was lost during the svn reorg. I > recovered it. Thanks. Sorry for that. > There are a couple of simple fixes sitting in there and waiting for a > vote, but if we are still RTC, I would like to apply them before 1.1.17. > I was just wondering because of Marks backports yesterday. Time to check the archives. If it is RTC I'll revert my back ports and propose any that don't already have proposals. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: tcnative 1.1.x CTR or RTC
On 16.09.2009 13:49, Mark Thomas wrote: > Rainer Jung wrote: >> Is tcnative 1.1.x CTR or RTC? > > I thought CTR - if that was wrong then I apologise. No need. >> We once had a status file, which was lost during the svn reorg. I >> recovered it. > > Thanks. Sorry for that. Thanks for doing the reorg work! >> There are a couple of simple fixes sitting in there and waiting for a >> vote, but if we are still RTC, I would like to apply them before 1.1.17. >> I was just wondering because of Marks backports yesterday. > > Time to check the archives. If it is RTC I'll revert my back ports and > propose any that don't already have proposals. Hmmm, maybe time for Mladen or Jean-Frederic to remind us? I guess the existence of a status file indicates we had RTC in mind. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: tcnative 1.1.x CTR or RTC
On 16/09/09 13:23, Rainer Jung wrote: Is tcnative 1.1.x CTR or RTC? CTR, with standard branch exceptional clause: "No new features, no API changes." There are a couple of simple fixes sitting in there and waiting for a vote, but if we are still RTC, I would like to apply them before 1.1.17. Sure, just commit them if they don't cause regression. I also have one nasty OpenSSL/windows fix, and would like to push for a 1.1.17 ASAP. Regards -- ^TM - 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=815740&view=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=815740&r1=815739&r2=815740&view=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=714101&r2=714100 - http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/jnirelease.sh?r1=714101&r2=714100 - +1: rjung - -1: - -* Fix typo. http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?r1=714101&r2=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=815740&r1=815739&r2=815740&view=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=815742&view=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=815742&r1=815741&r2=815742&view=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=733829&view=rev
- +1: rjung
- -1:
-
* Fix typo.
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/native/build/tcnative.m4?r1=714101&r2=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=815742&r1=815741&r2=815742&view=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="${title} (Version ${version})
"
-bottom="Copyright 2002-2004 The Apache Software Foundation. (https://issues.apache.org/bugzilla/attachment.cgi?id=24276)
Javadoc patch (incomplete, see text)
The attached patch fixes some Javadoc parameter errors in TC native 1.1x
There are some instances of TBA which need to be completed by someone who knows
the code better than I do...
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 46457] Typos in multicast.c
https://issues.apache.org/bugzilla/show_bug.cgi?id=46457 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #2 from Rainer Jung 2009-09-16 06:59:59 PDT --- Applied to 1.1.x branch as r815348. Will be part of version 1.1.17. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: 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=815794&view=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=815794&r1=815793&r2=815794&view=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. + + + + 46950: Fix SSL renegotiation in combination with client + certificates. The complete solution also needs a fix in Tomcat's Java code. (markt) + + + Align method names and signatures of native C code and java code. (markt, rjung) + + + 42728: Remove memory leak. (markt) + + + 46457: Fix use of multicast. (markt) + + + Fix API name for recvfrom (mturk) + + + Allow building against APR 1.3 (mturk) + + + Improve fix for 43327 with better handling for IPv6 + addresses (markt) + + + + - 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=815792&view=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=815792&r1=815791&r2=815792&view=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=rev&revision=803803 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r815768 - in /tomcat/native/branches/1.1.x: ./ java/org/apache/tomcat/jni/
rj...@apache.org wrote: > Author: rjung > Date: Wed Sep 16 13:24:54 2009 > New Revision: 815768 > > URL: http://svn.apache.org/viewvc?rev=815768&view=rev > Log: > Sync java parts of tcnative with C part. Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have their own copies. Mark > > 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=815768&r1=815767&r2=815768&view=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=rev&revision=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=rev&revision=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=815768&r1=815767&r2=815768&view=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=815768&r1=815767&r2=815768&view=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=815768&r1=815767&r2=815768&view=diff > == > ---
Re: svn commit: r815768 - in /tomcat/native/branches/1.1.x: ./ java/org/apache/tomcat/jni/
On 16.09.2009 16:18, Mark Thomas wrote: > rj...@apache.org wrote: >> Author: rjung >> Date: Wed Sep 16 13:24:54 2009 >> New Revision: 815768 >> >> URL: http://svn.apache.org/viewvc?rev=815768&view=rev >> Log: >> Sync java parts of tcnative with C part. > > Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have > their own copies. I actually don't know. I didn't check how the build process works. Mladen? Jean-Frederic? Note that I also added a backport proposal to the TC 6 copy. Regards, Rainer - 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=815814&view=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=815814&r1=815813&r2=815814&view=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=815814&r1=815813&r2=815814&view=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=815814&r1=815813&r2=815814&view=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=815814&r1=815813&r2=815814&view=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 */
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=815816&view=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=815816&r1=815815&r2=815816&view=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=815816&r1=815815&r2=815816&view=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=815816&r1=815815&r2=815816&view=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=815816&r1=815815&r2=815816&view=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)
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=815818&view=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=815818&r1=815817&r2=815818&view=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=815818&r1=815817&r2=815818&view=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=815818&r1=815817&r2=815818&view=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=815818&r1=815817&r2=815818&view=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 theso
How do I get hold of Tomcat JDBC pool lib
Hi, Not sure if this is the right forum to post this question. I recently heard about the new Tomcat JDBC library, an alternative for the DBCP lib. We see concurrency issues with the DBCP lib and are desperately looking for a lib which can work in a highly concurrent application. Had some questions about this lib... 1. Can this library be used with Tomcat 5.0.25. (ya I know this version was used in the stone age :)) ) 2. Is there a general release available 3. Where can I get binaries / src for the latest build (GA or beta) Thanks in advance for your help. - Gaurav
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=815819&view=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=815819&r1=815818&r2=815819&view=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=815748&view=rev http://svn.apache.org/viewvc?rev=815768&view=rev http://svn.apache.org/viewvc?rev=706574&view=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=815820&view=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=815820&r1=815819&r2=815820&view=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=815820&r1=815819&r2=815820&view=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=815820&r1=815819&r2=815820&view=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=815820&r1=815819&r2=815820&view=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
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=815821&view=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=815821&r1=815820&r2=815821&view=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=815821&r1=815820&r2=815821&view=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=815821&r1=815820&r2=815821&view=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=815821&r1=815820&r2=815821&view=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 ByteBu
DO NOT REPLY [Bug 47852] [patch] Javadoc errors in 1.1x
https://issues.apache.org/bugzilla/show_bug.cgi?id=47852 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #1 from Rainer Jung 2009-09-16 08:02:19 PDT --- Thanks for the patch. I committed it for 1.1.x (though maybe the Java code there is not used), and for TC 4.1, 5.5, 6.0 and trunk. I also replaced the pool TBAs with a short explanation. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r815768 - in /tomcat/native/branches/1.1.x: ./ java/org/apache/tomcat/jni/
On 16/09/09 16:18, Mark Thomas wrote: rj...@apache.org wrote: Author: rjung Date: Wed Sep 16 13:24:54 2009 New Revision: 815768 URL: http://svn.apache.org/viewvc?rev=815768&view=rev Log: Sync java parts of tcnative with C part. Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have their own copies. Yes, we need the java part as well, at least for the tomcat-native-xxx.src. Not sure how Apache Mina folks build their suff with tomcat native but I suppose by using the source archive. However we can modify the dist script to pull the java part from the 6.0.x branch so it doesn't have to be duplicated. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
mod_jk shm and locking questions
In working on a private copy of the mod_jk module, I notice that mod_jk doesn't seem to use either the EAPI shared memory management routines (in Apache 1.3) and in Apache 2.2 doesn't appear to use the APR routines for either shared memory or locking (except for the log lock). Before I make changes, I'd like to know if this is historical, and someone just never got around to updating it, or if it's intentional because you know about some severe problems/bugs associated with the APR libraries such that using their locking mechanisms and shared memory routines won't work. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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=815845&view=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
Re: mod_jk shm and locking questions
On 16.09.2009 17:38, Michael Durket wrote: > In working on a private copy of the mod_jk module, I notice that mod_jk > doesn't seem to use > either the EAPI shared memory management routines (in Apache 1.3) and > in Apache 2.2 > doesn't appear to use the APR routines for either shared memory or > locking (except for the > log lock). > > Before I make changes, I'd like to know if this is historical, and > someone just never got around > to updating it, or if it's intentional because you know about some > severe problems/bugs associated > with the APR libraries such that using their locking mechanisms and > shared memory routines > won't work. Mostly historical. mod_jk uses a lot of common code for supporting the Apache web server, but also IIS and Sun web servers. That code was historically written without the use of APR. There is a long standing idea of migrating everything to APR and thus introducing the APR dependency even for the ISAPI and NSAPI variants. Using EAPI fpr httpd 1.3 would have also introduced a dependency that's not fulfilled e.g. by the default httpd 1.3 source download. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815847 - /tomcat/trunk/res/maven/
Author: markt Date: Wed Sep 16 15:46:06 2009 New Revision: 815847 URL: http://svn.apache.org/viewvc?rev=815847&view=rev Log: Add a bunch of additional poms. Added: tomcat/trunk/res/maven/catalina-ant.pom (with props) tomcat/trunk/res/maven/catalina-jmx-remote.pom (with props) tomcat/trunk/res/maven/catalina-ws.pom (with props) tomcat/trunk/res/maven/embed-core.pom (with props) tomcat/trunk/res/maven/embed-jasper.pom (with props) tomcat/trunk/res/maven/embed-logging-juli.pom (with props) tomcat/trunk/res/maven/embed-logging-log4j.pom (with props) tomcat/trunk/res/maven/tomcat-api.pom (with props) tomcat/trunk/res/maven/tomcat-i18n-es.pom (with props) tomcat/trunk/res/maven/tomcat-i18n-fr.pom (with props) tomcat/trunk/res/maven/tomcat-i18n-ja.pom (with props) Added: tomcat/trunk/res/maven/catalina-ant.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/catalina-ant.pom?rev=815847&view=auto == --- tomcat/trunk/res/maven/catalina-ant.pom (added) +++ tomcat/trunk/res/maven/catalina-ant.pom Wed Sep 16 15:46:06 2009 @@ -0,0 +1,50 @@ + + + + 4.0.0 + org.apache.tomcat + catalina-ant + @MAVEN.DEPLOY.VERSION@ + Tomcat Ant tasks for remote management + + + org.apache.tomcat + coyote + @MAVEN.DEPLOY.VERSION@ + compile + + + org.apache.tomcat + servlet-api + @MAVEN.DEPLOY.VERSION@ + compile + + + org.apache.tomcat + juli + @MAVEN.DEPLOY.VERSION@ + compile + + + org.apache.tomcat + catalina + @MAVEN.DEPLOY.VERSION@ + compile + + + Propchange: tomcat/trunk/res/maven/catalina-ant.pom -- svn:eol-style = native Propchange: tomcat/trunk/res/maven/catalina-ant.pom -- svn:keywords = Date Author Id Revision Added: tomcat/trunk/res/maven/catalina-jmx-remote.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/catalina-jmx-remote.pom?rev=815847&view=auto == --- tomcat/trunk/res/maven/catalina-jmx-remote.pom (added) +++ tomcat/trunk/res/maven/catalina-jmx-remote.pom Wed Sep 16 15:46:06 2009 @@ -0,0 +1,32 @@ + + + + 4.0.0 + org.apache.tomcat + catalina-jmx-remote + @MAVEN.DEPLOY.VERSION@ + Tomcat Remote JMX listener + + + org.apache.tomcat + catalina + @MAVEN.DEPLOY.VERSION@ + compile + + + Propchange: tomcat/trunk/res/maven/catalina-jmx-remote.pom -- svn:eol-style = native Propchange: tomcat/trunk/res/maven/catalina-jmx-remote.pom -- svn:keywords = Date Author Id Revision Added: tomcat/trunk/res/maven/catalina-ws.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/catalina-ws.pom?rev=815847&view=auto == --- tomcat/trunk/res/maven/catalina-ws.pom (added) +++ tomcat/trunk/res/maven/catalina-ws.pom Wed Sep 16 15:46:06 2009 @@ -0,0 +1,32 @@ + + + + 4.0.0 + org.apache.tomcat + catalina-ws + @MAVEN.DEPLOY.VERSION@ + Tomcat Remote JMX listener + + + org.apache.tomcat + catalina + @MAVEN.DEPLOY.VERSION@ + compile + + + Propchange: tomcat/trunk/res/maven/catalina-ws.pom -- svn:eol-style = native Propchange: tomcat/trunk/res/maven/catalina-ws.pom -- svn:keywords = Date Author Id Revision Added: tomcat/trunk/res/maven/embed-core.pom URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/embed-core.pom?rev=815847&view=auto == --- tomcat/trunk/res/maven/embed-core.pom (added) +++ tomcat/trunk/res/maven/embed-core.pom Wed Sep 16 15:46:06 2009 @@ -0,0 +1,40 @@ + + + + 4.0.0 + org.apache.tomcat.embed + core + @MAVEN.DEPLOY.VERSION@ + Core Tomcat implementation + + + org.apache.tomcat.embed + logging-juli + @MAVEN.DEPLOY.VERSION@ + compile + true + + + org.apache.tomcat.embed + logging-log4j + @MAVEN.DEPLOY.VERSION@ + compile + true + + + Propchange: tomcat/trunk/res/maven/embed-core.pom -- svn:eol-style = native Propchange: tomcat/trunk/res/maven/embed-core.pom -- svn:keywords = Date Author Id Revision Added: tomcat/trunk/res/maven/embed-jasper.p
svn commit: r815849 - in /tomcat/trunk/res/maven: mvn-pub.xml mvn.properties.default
Author: markt Date: Wed Sep 16 15:49:01 2009 New Revision: 815849 URL: http://svn.apache.org/viewvc?rev=815849&view=rev Log: Add the extra JARs, update version numbers and add a note about some issues I saw on Windows. Modified: tomcat/trunk/res/maven/mvn-pub.xml tomcat/trunk/res/maven/mvn.properties.default Modified: tomcat/trunk/res/maven/mvn-pub.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn-pub.xml?rev=815849&r1=815848&r2=815849&view=diff == --- tomcat/trunk/res/maven/mvn-pub.xml (original) +++ tomcat/trunk/res/maven/mvn-pub.xml Wed Sep 16 15:49:01 2009 @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: tomcat/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=815849&r1=815848&r2=815849&view=diff == --- tomcat/trunk/res/maven/mvn.properties.default (original) +++ tomcat/trunk/res/maven/mvn.properties.default Wed Sep 16 15:49:01 2009 @@ -27,6 +27,9 @@ maven.gpg.passphrase=* +# You'll also need to install jsch 0.1.42 and manually configure +# wagon-ssh 1.0-beta-2 to use the updated jsch +# You'll also need jzlib 1.0.7 maven.home=/development/maven-2.0.4 #Define mvn for Unix systems and mvn.bat for Windows as ANT exec requires the full name maven.bin=mvn.bat @@ -34,22 +37,23 @@ #Maven snapshot properties maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository maven.snapshot.repo.repositoryId=apache.snapshots -maven.snapshot.deploy.version=6.T.X-SNAPSHOT +maven.snapshot.deploy.version=7.0.0 #Maven release properties for Tomcat staging maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository maven.release.repo.repositoryId=tomcat-staging -maven.release.deploy.version=6.T.X +maven.release.deploy.version=7.0.0 #Maven release properties for the main ASF repo maven.asf.release.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository maven.asf.release.repo.repositoryId=apache.releases -maven.asf.release.deploy.version=6.T.T +maven.asf.release.deploy.version=7.0.0 #Where do we load the libraries from tomcat.lib.path=../../output/build/lib tomcat.bin.path=../../output/build/bin +tomcat.embed.path=../../output/embed tomcat.extras.path=../../output/extras #Where do we find the POM files - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47678] Unable to allocate shared memory when using isapi_redirect.dll as an extension and filter
https://issues.apache.org/bugzilla/show_bug.cgi?id=47678 --- Comment #1 from Eric Smith 2009-09-16 08:52:36 PDT --- I am seeing the same error message using the 32-bit v1.2.28 dll under Windows 2008 Server 64bit, IIS 7.0, with app pools setting [Enable 32-bit Applications] to true. The same system worked fine with v1.2.26 prior to upgrading to v1.2.28 and after reverting to v1.2.26. I did not try the proposed patch. [Wed Sep 16 08:20:57.762 2009] [4312:4360] [info] jk_isapi_plugin.c (2572): Jakarta/ISAPI/isapi_redirector/1.2.28 initialized [Wed Sep 16 08:20:59.512 2009] [4860:5032] [info] jk_isapi_plugin.c (2405): Starting Jakarta/ISAPI/isapi_redirector/1.2.28 [Wed Sep 16 08:20:59.512 2009] [4860:5032] [error] jk_isapi_plugin.c (2538): Initializing shm:(null) errno=-1. Load balancing workers will not function properly. My worker.properties file: worker.nodehbi.port=8009 worker.nodehbi.host=localhost worker.nodehbi.type=ajp13 worker.nodehbi.lbfactor=1 worker.nodeportal.port=8109 worker.nodeportal.host=localhost worker.nodeportal.type=ajp13 worker.nodeportal.lbfactor=1 # List all workers worker.list=nodehbi, nodeportal # Status worker for managing load balancer worker.status.type=status -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47678] Unable to allocate shared memory when using isapi_redirect.dll as an extension and filter
https://issues.apache.org/bugzilla/show_bug.cgi?id=47678 Eric Smith changed: What|Removed |Added CC||eric.sm...@mckesson.com -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815855 - /tomcat/trunk/res/maven/mvn.properties.default
Author: markt Date: Wed Sep 16 16:02:39 2009 New Revision: 815855 URL: http://svn.apache.org/viewvc?rev=815855&view=rev Log: Correct the SNAPSHOT version number Modified: tomcat/trunk/res/maven/mvn.properties.default Modified: tomcat/trunk/res/maven/mvn.properties.default URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/mvn.properties.default?rev=815855&r1=815854&r2=815855&view=diff == --- tomcat/trunk/res/maven/mvn.properties.default (original) +++ tomcat/trunk/res/maven/mvn.properties.default Wed Sep 16 16:02:39 2009 @@ -37,7 +37,7 @@ #Maven snapshot properties maven.snapshot.repo.url=scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository maven.snapshot.repo.repositoryId=apache.snapshots -maven.snapshot.deploy.version=7.0.0 +maven.snapshot.deploy.version=7.0.0-SNAPSHOT #Maven release properties for Tomcat staging maven.release.repo.url=scp://people.apache.org/www/tomcat.apache.org/dev/dist/m2-repository - 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=815857&view=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=815859&view=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=815859&view=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 PGP&GPG 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 && pgpk -xa ) >> this file. + or +(gpg --fingerprint --list-sigs + && gpg --armor --export ) >> 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 + +-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 + +-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 +CgkQNYuqM1D5YRZwXQCdFHcDmoi2lK5guXZicaBLY4zRhL4An2H+k5bal1hA6xZm
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=815868&view=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=815868&r1=815867&r2=815868&view=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=815869&view=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=815869&r1=815868&r2=815869&view=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=815873&view=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=815873&r1=815872&r2=815873&view=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
How should we handle the Java files for native?
On 16.09.2009 17:24, Mladen Turk wrote: > On 16/09/09 16:18, Mark Thomas wrote: >> rj...@apache.org wrote: >>> Author: rjung >>> Date: Wed Sep 16 13:24:54 2009 >>> New Revision: 815768 >>> >>> URL: http://svn.apache.org/viewvc?rev=815768&view=rev >>> Log: >>> Sync java parts of tcnative with C part. >> >> Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have >> their own copies. >> > > Yes, we need the java part as well, at least for > the tomcat-native-xxx.src. Not sure how Apache Mina > folks build their suff with tomcat native but I > suppose by using the source archive. > > However we can modify the dist script to > pull the java part from the 6.0.x branch so it doesn't > have to be duplicated. Hmmm, how are users support to build? Until recently we were using a build.xml. If we don't include the sources, ant would need to retrieve them either via svn (for that you need an additional ant library), or by downloading a tomcat src distribution. So I guess the latter is the suggested way of doing it. Furthermore, there were three directories with Java classes for jni: java, test and examples. Only java made it into the TC 6 sources. The other two dirs are gone. They are still available in the TC 4.1 and 5.5 sources though. If we want to get every Java related file for jni from Tomcat, we would need to add the test and examples files back. build.xml and build.properties.default might make more sense in native itself. Comments? Regards, Rainer - 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=815877&view=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=815877&r1=815876&r2=815877&view=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=815879&view=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=815879&r1=815878&r2=815879&view=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=815883&view=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=815883&r1=815882&r2=815883&view=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=815883&r1=815882&r2=815883&view=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 @@
-->
-
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -46,15 +61,13 @@
-
-
-
+
-
-
+
+
@@ -145,7 +158,7 @@
-
+
@@ -157,10 +170,11 @@
destdir="${build.dest}/java"
debug="${debug}"
deprecation="${deprecation}"
-optimize="${optimize}">
+optimize="${optimize}"
+encoding="ISO-8859-1">
-
+
@@ -175,10 +189,11 @@
destdir="${build.home}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- optimize="${compile.optimize}">
+ optimize="${compile.optimize}"
+ encoding="ISO-8859-1">
-
+
@@ -199,7 +214,7 @@
-
+
@@ -211,10 +226,11 @@
destdir="${build.dest}/examples"
debug="${debug}"
deprecation="${deprecation}"
-optimize="${optimize}">
+optimize="${optimize}"
+encoding="ISO-8859-1">
-
+
@@ -251,7 +267,7 @@
-
+
@@ -262,8 +278,8 @@
destdir="${build.dest}/test"
debug="on"
deprecation="${deprecation}"
-optimize="${optimize}">
-
+optimize="${optimize}"
+encoding="ISO-8859-1">
@@ -295,7 +311,7 @@
-
+
@@ -306,8 +322,8 @@
destdir="${build.dest}/examples"
debug="${debug}"
deprecation="${deprecation}"
-optimize="${optimize}">
-
+optimize="${optimize}"
+encoding="ISO-8859-1">
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
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=815888&view=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=815889&view=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=815895&view=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=815899&view=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=815899&r1=815898&r2=815899&view=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=|trunk"
+echo " --ver=||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 2>&1
+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=815904&view=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=815904&r1=815903&r2=815904&view=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 2>&1
-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
Re: How should we handle the Java files for native?
On 16/09/09 18:53, Rainer Jung wrote: If we want to get every Java related file for jni from Tomcat, we would need to add the test and examples files back. build.xml and build.properties.default might make more sense in native itself. Comments? Sure, we should bring back java/examples and java/test The sources do not overlap with Tomcat sources. build.xml and properties should be brought back as well. They are usable for standalone builds. However we should probably create two source packages one with jni code only and one with jni + java (eg. src-all) for third-party users outside tomcat. OTOH one can easily get those files directly from tomcat source. But then again, which tomcat src matches which tomcat-native src mess would arise. So IMO having two source packages should make less trouble. Regards -- ^TM - 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=815949&view=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=815950&view=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: r815952 - /tomcat/trunk/res/maven/
Author: markt Date: Wed Sep 16 20:23:44 2009 New Revision: 815952 URL: http://svn.apache.org/viewvc?rev=815952&view=rev Log: Update to Maven deploy process. A SNAPHOT deployment of trunk should now work and include extras and embedded. Added: tomcat/trunk/res/maven/TODO-currently-empty-src.jar (with props) tomcat/trunk/res/maven/tomcat-annotations-api.pom - copied, changed from r815424, tomcat/trunk/res/maven/annotations-api.pom tomcat/trunk/res/maven/tomcat-catalina-ant.pom - copied, changed from r815847, tomcat/trunk/res/maven/catalina-ant.pom tomcat/trunk/res/maven/tomcat-catalina-ha.pom - copied, changed from r815424, tomcat/trunk/res/maven/catalina-ha.pom tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom - copied, changed from r815847, tomcat/trunk/res/maven/catalina-jmx-remote.pom tomcat/trunk/res/maven/tomcat-catalina-ws.pom - copied, changed from r815847, tomcat/trunk/res/maven/catalina-ws.pom tomcat/trunk/res/maven/tomcat-catalina.pom - copied, changed from r815424, tomcat/trunk/res/maven/catalina.pom tomcat/trunk/res/maven/tomcat-coyote.pom - copied, changed from r815424, tomcat/trunk/res/maven/coyote.pom tomcat/trunk/res/maven/tomcat-dbcp.pom - copied, changed from r815424, tomcat/trunk/res/maven/dbcp.pom tomcat/trunk/res/maven/tomcat-el-api.pom - copied, changed from r815424, tomcat/trunk/res/maven/el-api.pom tomcat/trunk/res/maven/tomcat-embed-core.pom - copied, changed from r815847, tomcat/trunk/res/maven/embed-core.pom tomcat/trunk/res/maven/tomcat-embed-jasper.pom - copied, changed from r815847, tomcat/trunk/res/maven/embed-jasper.pom tomcat/trunk/res/maven/tomcat-embed-logging-juli.pom - copied, changed from r815847, tomcat/trunk/res/maven/embed-logging-juli.pom tomcat/trunk/res/maven/tomcat-embed-logging-log4j.pom - copied, changed from r815847, tomcat/trunk/res/maven/embed-logging-log4j.pom tomcat/trunk/res/maven/tomcat-extras-juli-adapters.pom - copied, changed from r815424, tomcat/trunk/res/maven/juli-adapters.pom tomcat/trunk/res/maven/tomcat-extras-juli.pom - copied, changed from r815424, tomcat/trunk/res/maven/juli-extras.pom tomcat/trunk/res/maven/tomcat-jasper-el.pom - copied, changed from r815424, tomcat/trunk/res/maven/jasper-el.pom tomcat/trunk/res/maven/tomcat-jasper-jdt.pom - copied, changed from r815424, tomcat/trunk/res/maven/jasper-jdt.pom tomcat/trunk/res/maven/tomcat-jasper.pom - copied, changed from r815424, tomcat/trunk/res/maven/jasper.pom tomcat/trunk/res/maven/tomcat-jsp-api.pom - copied, changed from r815424, tomcat/trunk/res/maven/jsp-api.pom tomcat/trunk/res/maven/tomcat-juli.pom - copied, changed from r815424, tomcat/trunk/res/maven/juli.pom tomcat/trunk/res/maven/tomcat-servlet-api.pom - copied, changed from r815424, tomcat/trunk/res/maven/servlet-api.pom tomcat/trunk/res/maven/tomcat-tribes.pom - copied, changed from r815424, tomcat/trunk/res/maven/tribes.pom Removed: tomcat/trunk/res/maven/annotations-api.pom tomcat/trunk/res/maven/catalina-ant.pom tomcat/trunk/res/maven/catalina-ha.pom tomcat/trunk/res/maven/catalina-jmx-remote.pom tomcat/trunk/res/maven/catalina-ws.pom tomcat/trunk/res/maven/catalina.pom tomcat/trunk/res/maven/coyote.pom tomcat/trunk/res/maven/dbcp.pom tomcat/trunk/res/maven/el-api.pom tomcat/trunk/res/maven/embed-core.pom tomcat/trunk/res/maven/embed-jasper.pom tomcat/trunk/res/maven/embed-logging-juli.pom tomcat/trunk/res/maven/embed-logging-log4j.pom tomcat/trunk/res/maven/jasper-el.pom tomcat/trunk/res/maven/jasper-jdt.pom tomcat/trunk/res/maven/jasper.pom tomcat/trunk/res/maven/jsp-api.pom tomcat/trunk/res/maven/juli-adapters.pom tomcat/trunk/res/maven/juli-extras.pom tomcat/trunk/res/maven/juli.pom tomcat/trunk/res/maven/servlet-api.pom tomcat/trunk/res/maven/tribes.pom Modified: tomcat/trunk/res/maven/ (props changed) tomcat/trunk/res/maven/mvn-pub.xml tomcat/trunk/res/maven/mvn.properties.default Propchange: tomcat/trunk/res/maven/ -- --- svn:ignore (original) +++ svn:ignore Wed Sep 16 20:23:44 2009 @@ -1,4 +1,4 @@ *.tmp -maven-ant-tasks-attached-patch.jar -maven-artifact-ant-2.0.4-dep.jar +maven-ant-tasks-2.0.10.jar mvn.properties +*.asc Added: tomcat/trunk/res/maven/TODO-currently-empty-src.jar URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/TODO-currently-empty-src.jar?rev=815952&view=auto == Binary file - no diff available. Propchange: tomcat/trunk/res/maven/TODO-currently-empty-src.jar -- svn:keywords = Date Author Id Revision Propchange: tomcat/trunk/r
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=815954&view=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=815955&view=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: r815956 - in /tomcat/native/trunk: build.properties.default build.xml
Author: rjung Date: Wed Sep 16 20:33:18 2009 New Revision: 815956 URL: http://svn.apache.org/viewvc?rev=815956&view=rev Log: Update version number for trunk build files. 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=815956&r1=815955&r2=815956&view=diff == --- tomcat/native/trunk/build.properties.default (original) +++ tomcat/native/trunk/build.properties.default Wed Sep 16 20:33:18 2009 @@ -16,9 +16,9 @@ # # - Vesion Control Flags - -version.major=1 -version.minor=1 -version.build=17 +version.major=2 +version.minor=0 +version.build=0 version.patch=0 version.suffix=-dev Modified: tomcat/native/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/build.xml?rev=815956&r1=815955&r2=815956&view=diff == --- tomcat/native/trunk/build.xml (original) +++ tomcat/native/trunk/build.xml Wed Sep 16 20:33:18 2009 @@ -31,9 +31,9 @@ - - - + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815972 - /tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Author: markt
Date: Wed Sep 16 21:17:11 2009
New Revision: 815972
URL: http://svn.apache.org/viewvc?rev=815972&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47225
Buffer length is end-offset
Modified:
tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java?rev=815972&r1=815971&r2=815972&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/http/mapper/Mapper.java Wed Sep 16
21:17:11 2009
@@ -730,7 +730,7 @@
if(mappingData.wrapper == null && noServletPath) {
// The path is empty, redirect to "/"
mappingData.redirectPath.setChars
-(path.getBuffer(), pathOffset, pathEnd);
+(path.getBuffer(), pathOffset, pathEnd-pathOffset);
path.setEnd(pathEnd - 1);
return;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815975 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: markt Date: Wed Sep 16 21:23:43 2009 New Revision: 815975 URL: http://svn.apache.org/viewvc?rev=815975&view=rev Log: Proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.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=815975&r1=815974&r2=815975&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Sep 16 21:23:43 2009 @@ -146,3 +146,10 @@ http://svn.apache.org/viewvc?rev=815418&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47225 + Buffer length should be end-offset + http://svn.apache.org/viewvc?rev=815972&view=rev + +1: markt + -1: + Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=815975&r1=815974&r2=815975&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep 16 21:23:43 2009 @@ -340,3 +340,9 @@ 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. + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47225 + Buffer length should be end-offset + http://svn.apache.org/viewvc?rev=815972&view=rev + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47225] Wrong argument in redirectPath.setChars in Mapper.internalMapWrapper()
https://issues.apache.org/bugzilla/show_bug.cgi?id=47225 --- Comment #1 from Mark Thomas 2009-09-16 22:24:04 BST --- I'd guess pathOffset is (nearly) always zero. I have fixed it in trunk and proposed it for 6.0.x and 5.5.x -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 47227] Executor "namePrefix" property not working well
https://issues.apache.org/bugzilla/show_bug.cgi?id=47227 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME --- Comment #1 from Mark Thomas 2009-09-16 22:46:25 BST --- I can't reproduce this with trunk or 6.0.x. I have checked the code and the text "Null_Thread_Name" does not appear any where in the 6.0.x source. I also can't see, given the thread creation code, how a thread could end up with a null thread name. The only possibility I can think of is a JVM bug but there isn't much evidence of that. Given that this can't be reproduced and a source code review shows no obvious cause, I am resolving this as works for me. -- Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: 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=815983&view=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=815983&r1=815982&r2=815983&view=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=815983&r1=815982&r2=815983&view=diff
==
--- tomcat/native/trunk/build.xml (original)
+++ tomcat/native/trunk/build.xml Wed Sep 16 21:55:29 2009
@@ -54,9 +54,11 @@
-
-
-
+
+
+
+
+
@@ -104,6 +106,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -138,14 +199,14 @@
-
+
-
+
@@ -154,6 +215,12 @@
+
+
+
+
+
+
@@ -168,12 +235,15 @@
+
@@ -182,67 +252,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -276,18 +299,26 @@
+
+
+
+
+
+
-
+
@@ -308,9 +339,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -320,18 +361,26 @@
+
+
+
+
+
+
-
+
-
+
@@ -341,7 +390,7 @@
-
+
@@ -351,7 +400,7 @@
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=815985&view=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=815985&r1=815984&r2=815985&view=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=815986&view=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=815986&r1=815985&r2=815986&view=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=815989&view=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=815989&r1=815988&r2=815989&view=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=815989&r1=815988&r2=815989&view=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 @@
-
-
-
+
+
+
+
+
@@ -104,6 +106,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -138,14 +195,14 @@
-
+
-
+
@@ -168,12 +225,15 @@
+
@@ -182,67 +242,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
@@ -276,18 +289,26 @@
+
+
+
+
+
+
-
+
@@ -308,9 +329,19 @@
-
+
+
+
+
+
+
+
+
+
+
+
@@ -320,18 +351,26 @@
+
+
+
+
+
+
-
+
-
+
@@ -341,7 +380,7 @@
-
svn commit: r815990 - /tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
Author: rjung Date: Wed Sep 16 22:26:24 2009 New Revision: 815990 URL: http://svn.apache.org/viewvc?rev=815990&view=rev Log: Remove 1.1.x branch entries from trunk changelog. Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=815990&r1=815989&r2=815990&view=diff == --- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original) +++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Sep 16 22:26:24 2009 @@ -36,79 +36,8 @@ new documentation project for Tomcat Native was started. - + - - Fix API name for recvfrom (mturk) - - - Allow building against APR 1.3 (mturk) - - - Improve fix for 43327 with better handling for IPv6 - addresses (markt) - - - - - - - - 43327: Socket bind fail because mixing IPv4/IPv6 (markt, jfclere) - - - 44864: Use additional check for SSL verify like - with mod_ssl for SSLVerifyClient=optionalNoCA. (mturk) - - - - - - - - 45071: Reset ttl when Poll.pool remove is false. - Additional patch was provided by Alex Barclay. (mturk) - - - Fix optGet that was always throwing exceptions. (jfclere) - - - Fix optSet don't throw exception as JAVA prototype doesn't. (jfclere) - - - - - - - IFS problem in native/build/tcnative.m4 (rjung) - - - Wrong gcc link flag in native/build/tcnative.m4 (rjung) - - - - - - - Add support of J9VM based JVM. (jfclere) - - - Arrange licence in source files. (markt) - - - 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) - - - Arrange the check of openssl version. It was failing on Linux. (jfclere) - - - Prevent returning APR_SUCCESS when there is something wrong in ssl layer. (jfclere) - - - 44087: Fix it. (jfclere) - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815992 - /tomcat/tc5.5.x/trunk/STATUS.txt
Author: rjung Date: Wed Sep 16 22:34:42 2009 New Revision: 815992 URL: http://svn.apache.org/viewvc?rev=815992&view=rev Log: Add proposals. 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=815992&r1=815991&r2=815992&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Sep 16 22:34:42 2009 @@ -153,3 +153,21 @@ +1: markt -1: +* Remove native test and examples classes from TC 5.5 + (connectors/jni/test, connectors/jni/examples). + They have been recovered in native trunk and are also part of + the native 1.1.x branch. + They are not present in TC 6.0 and trunk. + svn rm https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk/connectors/jni/test + svn rm https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk/connectors/jni/examples + +1: rjung + -1: + +* Clean up native classes (connectors/jni) in TC 5.5: + - Remove all tasks in build.xml except for compile-only +That's the only task used (called) by our top level build.xml + - Remove build.properties.default. All that's needed is in +the top level file + +1: rjung + -1: + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r815995 - /tomcat/native/trunk/jnirelease.sh
Author: rjung
Date: Wed Sep 16 22:47:16 2009
New Revision: 815995
URL: http://svn.apache.org/viewvc?rev=815995&view=rev
Log:
Remove comment now that we have those files back.
Modified:
tomcat/native/trunk/jnirelease.sh
Modified: tomcat/native/trunk/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=815995&r1=815994&r2=815995&view=diff
==
--- tomcat/native/trunk/jnirelease.sh (original)
+++ tomcat/native/trunk/jnirelease.sh Wed Sep 16 22:47:16 2009
@@ -105,12 +105,6 @@
rm -rf ${JKJNIDIST}
-#
-# 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"
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: How should we handle the Java files for native?
On 16.09.2009 20:58, Mladen Turk wrote: > On 16/09/09 18:53, Rainer Jung wrote: >> If we want to get every Java related file for jni from Tomcat, we would >> need to add the test and examples files back. >> >> build.xml and build.properties.default might make more sense in native >> itself. >> >> Comments? >> > > Sure, we should bring back java/examples and java/test > The sources do not overlap with Tomcat sources. > build.xml and properties should be brought back as well. > They are usable for standalone builds. > > However we should probably create two source packages > one with jni code only and one with jni + java (eg. src-all) > for third-party users outside tomcat. > > OTOH one can easily get those files directly from tomcat source. > But then again, which tomcat src matches which tomcat-native > src mess would arise. > So IMO having two source packages should make less trouble. examples, test and build.* are back and hopefully somewhat improved. I added "ant download" to native trunk, which retrieves the TC 6 sources for the version defined in build.properties(.default). "ant compile" then copies over the needed package. One can also fake the downloaded Tomcat sources by setting tomcat.src to the source directory (e.g. when the TC release including Java changes waits for the native release including native changes, so there's no correct Tomcat source download yet available). I didn't yet add the two distributions option to the jnirelease.sh. I also added two proposals to clean up the TC 5.5 jni copy to the TC 5.5 status file. Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r816004 - /tomcat/native/trunk/jnirelease.sh
Author: rjung
Date: Wed Sep 16 23:10:03 2009
New Revision: 816004
URL: http://svn.apache.org/viewvc?rev=816004&view=rev
Log:
Bring jni (native) release script in trunk
closer to the 1.1.x branch version.
Major difference still there: branch still uses
the now obsolete "jni" sub directory in order to
not confuse existing users by changing the
distribution structure in the middle of the branch.
Modified:
tomcat/native/trunk/jnirelease.sh
Modified: tomcat/native/trunk/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/jnirelease.sh?rev=816004&r1=816003&r2=816004&view=diff
==
--- tomcat/native/trunk/jnirelease.sh (original)
+++ tomcat/native/trunk/jnirelease.sh Wed Sep 16 23:10:03 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
@@ -55,7 +55,7 @@
echo ""
echo "Problem finding apr source in: \`$apr_src_dir'"
echo "Use:"
-echo " --with-apr="
+echo " --with-apr="
echo ""
exit 1
fi
@@ -64,7 +64,7 @@
echo ""
echo "Unknown SVN version"
echo "Use:"
-echo " --ver=|trunk"
+echo " --ver=||trunk"
echo ""
exit 1
fi
@@ -91,13 +91,25 @@
exit 1
fi
-echo "Using SVN repo : \`$SVNBASE/${JKJNIEXT}'"
+echo $JKJNIEXT | egrep -e 'x$' > /dev/null 2>&1
+if [ $? -eq 0 ]; then
+USE_BRANCH=1
+else
+USE_BRANCH=0
+fi
+
+JKJNISVN=$SVNBASE/${JKJNIEXT}
if [ "x$JKJNIEXT" = "xtrunk" ]; then
-JKJNIVER=`svn info $SVNBASE | 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/other/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`"
+JKJNISVN="${SVNBASE}/tags/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`"
fi
+echo "Using SVN repo : \`${JKJNISVN}'"
echo "Using version: \`${JKJNIVER}'"
@@ -105,7 +117,7 @@
rm -rf ${JKJNIDIST}
-svn export $SVNBASE/${JKJNIEXT} ${JKJNIDIST}
+svn export ${JKJNISVN} ${JKJNIDIST}
if [ $? -ne 0 ]; then
echo "svn export failed"
exit 1
@@ -138,10 +150,10 @@
JKWINDIST=tomcat-native-${JKJNIVER}-win32-src
rm -rf ${JKWINDIST}
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}/README.txt > ${JKWINDIST}/README.txt
+svn export --native-eol CRLF ${JKJNISVN}/native ${JKWINDIST}/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
Re: what does j_security_check do in clustering?
hi Mark, Thanks, I will send a mail there. I thought developers hold more knowledge on this. So just want a confirm of my question. -Rex 2009/9/16 Mark Thomas > Rex Wang wrote: > > Dear Tomcat devs, > > > > I meet a problem when config a web project which using the form based > > security in clustering. > > > > When I set session affinity = true in my front http server, the security > > check was done in single node, there is no problem with that. > > But if I set affinity = false, the requests from the security check > process > > are sent to 2 nodes, and it is really strange.. eg: > > > > 1. From index.html(NodeA), try to access protected resouce > > 2. Go to the logon.html(NodeB), I input the id/passwd, and then submit > > 3. The request looks like sent to NodeA, but did not do any check > operation. > > > > Does that work as design? that is, if I wanna use form check security, my > > cluster must be session affinity? > > That would be a question for the users list. > > Mark > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: How should we handle the Java files for native?
On 09/16/2009 06:53 PM, Rainer Jung wrote: On 16.09.2009 17:24, Mladen Turk wrote: On 16/09/09 16:18, Mark Thomas wrote: rj...@apache.org wrote: Author: rjung Date: Wed Sep 16 13:24:54 2009 New Revision: 815768 URL: http://svn.apache.org/viewvc?rev=815768&view=rev Log: Sync java parts of tcnative with C part. Do we need the java part here any more? 5.5.x, 6.0.x and trunk all have their own copies. Yes, we need the java part as well, at least for the tomcat-native-xxx.src. Not sure how Apache Mina folks build their suff with tomcat native but I suppose by using the source archive. However we can modify the dist script to pull the java part from the 6.0.x branch so it doesn't have to be duplicated. Hmmm, how are users support to build? Until recently we were using a build.xml. If we don't include the sources, ant would need to retrieve them either via svn (for that you need an additional ant library), or by downloading a tomcat src distribution. So I guess the latter is the suggested way of doing it. Furthermore, there were three directories with Java classes for jni: java, test and examples. Only java made it into the TC 6 sources. The other two dirs are gone. They are still available in the TC 4.1 and 5.5 sources though. If we want to get every Java related file for jni from Tomcat, we would need to add the test and examples files back. +1 Cheers Jean-Frederic build.xml and build.properties.default might make more sense in native itself. Comments? Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
