date:20090202

svn commit: r740042 - /tomcat/connectors/branches/native/1.1.x/jni/jnirelease.sh

2009-02-02 Thread mturk

Author: mturk
Date: Mon Feb  2 17:05:37 2009
New Revision: 740042

URL: http://svn.apache.org/viewvc?rev=740042&view=rev
Log:
Backport r740038 from trunk.
No need for backport proposal because its a release helper tool
not actually released

Modified:
tomcat/connectors/branches/native/1.1.x/jni/jnirelease.sh

Modified: tomcat/connectors/branches/native/1.1.x/jni/jnirelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/branches/native/1.1.x/jni/jnirelease.sh?rev=740042&r1=740041&r2=740042&view=diff
==
--- tomcat/connectors/branches/native/1.1.x/jni/jnirelease.sh (original)
+++ tomcat/connectors/branches/native/1.1.x/jni/jnirelease.sh Mon Feb  2 
17:05:37 2009
@@ -17,105 +17,133 @@
 #
 # Default place to look for apr source.  Can be overridden with 
 #   --with-apr=[directory]
-apr_src_dir=`pwd`/srclib/apr-1.2.8
+apr_src_dir=`pwd`/srclib/apr
+JKJNIEXT=""
+JKJNIVER=""
+SVNBASE=https://svn.apache.org/repos/asf/tomcat/connectors/
 
-while test $# -gt 0 
+for o
 do
-  # Normalize
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case "$1" in
-  --with-apr=*)
-  apr_src_dir=$optarg
-  ;;
-  esac
+case "$o" in
+-*=*) a=`echo "$o" | sed 's/^[-_a-zA-Z0-9]*=//'` ;;
+   *) a='' ;;
+esac
+case "$o" in
+--ver*=*)
+JKJNIEXT="$a"
+shift
+;;
+--with-apr=* )
+apr_src_dir="$a" ;
+shift ;;
+*  )
+echo ""
+echo "Usage: jnirelease.sh [options]"
+echo "  --ver[sion]=  Tomcat Native version"
+echo "  --with-apr= APR sources directory"
+echo ""
+exit 1
+;;
+esac
+done
+
+
+if [ -d "$apr_src_dir" ]; then
+echo ""
+echo "Using apr source from: \`$apr_src_dir'"
+else
+echo ""
+echo "Problem finding apr source in: \`$apr_src_dir'"
+echo "Use:"
+echo "  --with-apr=" 
+echo ""
+exit 1
+fi
+
+if [ "x$JKJNIEXT" = "x" ]; then
+echo ""
+echo "Unknown SVN version"
+echo "Use:"
+echo "  --ver=|trunk" 
+echo ""
+exit 1
+fi
 
-  shift
+# Check for links, elinks or w3m
+w3m_opts="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
+elinks_opts="-dump -dump-width 80 -dump-charset iso-8859-1 -no-numbering 
-no-references -no-home"
+links_opts="-dump -width 80 -codepage iso-8859-1 -no-g -html-numbered-links 0"
+EXPTOOL=""
+EXPOPTS=""
+for i in w3m elinks links
+do
+EXPTOOL="`which $i 2>/dev/null || type $i 2>&1`"
+if [ -x "$EXPTOOL" ]; then
+EXPOPTS="`eval echo \"\$$i_opts\"`"
+break
+fi
 done
+if [ ! -x "$EXPTOOL" ]; then
+echo ""
+echo "Cannot find html export tool"
+echo "Make sure you have either w3m elinks or links in the PATH"
+echo ""
+exit 1
+fi
 
-if test -d "$apr_src_dir"
-then
-  echo ""
-  echo "Looking for apr source in $apr_src_dir"
+echo "Using SVN repo   : \`$SVNBASE/${JKJNIEXT}'"
+if [ "x$JKJNIEXT" = "xtrunk" ]; then
+JKJNIVER=`svn info $SVNBASE | awk '$1 == "Revision:" {print $2}'`
 else
-  echo ""
-  echo "Problem finding apr source in $apr_src_dir."
-  echo "Use:"
-  echo "  --with-apr=[directory]" 
-  exit 1
+JKJNIVER=$JKJNIEXT
+JKJNIEXT="tags/other/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`"
 fi
+echo "Using version: \`${JKJNIVER}'"
+
 
-# Replace JKJNIEXT with branch/or tag
-# and JKJNIVER by the version like 1.1.0
-# DON't forget to update native/include/tcn_version.h
-# and native/os/win32/libtcnative.rc
-# #define TCN_VERISON "1.1.14"
-# FILEVERSION 1,1,14,0
-# PRODUCTVERSION 1,1,14,0
-JKJNIEXT="tags/other/TOMCAT_NATIVE_1_1_15"
-JKJNIVER="1.1.15"
-#JKJNIEXT="trunk"
-#JKJNIVER="current"
-SVNBASE=https://svn.apache.org/repos/asf/tomcat/connectors/
 JKJNIDIST=tomcat-native-${JKJNIVER}-src
+
 rm -rf ${JKJNIDIST}
 mkdir -p ${JKJNIDIST}/jni
-svn export $SVNBASE/${JKJNIEXT}/jni/native ${JKJNIDIST}/jni/native
-if [ $? -ne 0 ]; then
-  echo "svn export native failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/java ${JKJNIDIST}/jni/java
-if [ $? -ne 0 ]; then
-  echo "svn export java failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/build.xml ${JKJNIDIST}/jni/build.xml
-if [ $? -ne 0 ]; then
-  echo "svn export build.xml failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/build.properties.sample 
${JKJNIDIST}/jni/build.properties.sample
-if [ $? -ne 0 ]; then
-  echo "svn export build.xml failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/examples ${JKJNIDIST}/jni/examples
-if [ $? -ne 0 ]; then
-  echo "svn export examples failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/test ${JKJNIDIST}/jni/test
-if [ $? -ne 0 ]; then
-  echo "svn export test failed"
-  exit 1
-fi
+for i in native java xdocs examples test build.xml build.properties.sample
+do
+svn export $SVNBASE/${JKJNIEXT}/jni/${i} ${JKJNIDIST}/jni/${i}
+if [ $? -ne 0 ]; then
+echo "svn e

svn commit: r740038 - /tomcat/connectors/trunk/jni/jnirelease.sh

2009-02-02 Thread mturk

Author: mturk
Date: Mon Feb  2 17:00:11 2009
New Revision: 740038

URL: http://svn.apache.org/viewvc?rev=740038&view=rev
Log:
Extend jnirelease so it checks out the CHANGES and ease the release with cmd 
options

Modified:
tomcat/connectors/trunk/jni/jnirelease.sh

Modified: tomcat/connectors/trunk/jni/jnirelease.sh
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jni/jnirelease.sh?rev=740038&r1=740037&r2=740038&view=diff
==
--- tomcat/connectors/trunk/jni/jnirelease.sh (original)
+++ tomcat/connectors/trunk/jni/jnirelease.sh Mon Feb  2 17:00:11 2009
@@ -17,105 +17,133 @@
 #
 # Default place to look for apr source.  Can be overridden with 
 #   --with-apr=[directory]
-apr_src_dir=`pwd`/srclib/apr-1.2.8
+apr_src_dir=`pwd`/srclib/apr
+JKJNIEXT=""
+JKJNIVER=""
+SVNBASE=https://svn.apache.org/repos/asf/tomcat/connectors/
 
-while test $# -gt 0 
+for o
 do
-  # Normalize
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case "$1" in
-  --with-apr=*)
-  apr_src_dir=$optarg
-  ;;
-  esac
+case "$o" in
+-*=*) a=`echo "$o" | sed 's/^[-_a-zA-Z0-9]*=//'` ;;
+   *) a='' ;;
+esac
+case "$o" in
+--ver*=*)
+JKJNIEXT="$a"
+shift
+;;
+--with-apr=* )
+apr_src_dir="$a" ;
+shift ;;
+*  )
+echo ""
+echo "Usage: jnirelease.sh [options]"
+echo "  --ver[sion]=  Tomcat Native version"
+echo "  --with-apr= APR sources directory"
+echo ""
+exit 1
+;;
+esac
+done
+
+
+if [ -d "$apr_src_dir" ]; then
+echo ""
+echo "Using apr source from: \`$apr_src_dir'"
+else
+echo ""
+echo "Problem finding apr source in: \`$apr_src_dir'"
+echo "Use:"
+echo "  --with-apr=" 
+echo ""
+exit 1
+fi
+
+if [ "x$JKJNIEXT" = "x" ]; then
+echo ""
+echo "Unknown SVN version"
+echo "Use:"
+echo "  --ver=|trunk" 
+echo ""
+exit 1
+fi
 
-  shift
+# Check for links, elinks or w3m
+w3m_opts="-dump -cols 80 -t 4 -S -O iso-8859-1 -T text/html"
+elinks_opts="-dump -dump-width 80 -dump-charset iso-8859-1 -no-numbering 
-no-references -no-home"
+links_opts="-dump -width 80 -codepage iso-8859-1 -no-g -html-numbered-links 0"
+EXPTOOL=""
+EXPOPTS=""
+for i in w3m elinks links
+do
+EXPTOOL="`which $i 2>/dev/null || type $i 2>&1`"
+if [ -x "$EXPTOOL" ]; then
+EXPOPTS="`eval echo \"\$$i_opts\"`"
+break
+fi
 done
+if [ ! -x "$EXPTOOL" ]; then
+echo ""
+echo "Cannot find html export tool"
+echo "Make sure you have either w3m elinks or links in the PATH"
+echo ""
+exit 1
+fi
 
-if test -d "$apr_src_dir"
-then
-  echo ""
-  echo "Looking for apr source in $apr_src_dir"
+echo "Using SVN repo   : \`$SVNBASE/${JKJNIEXT}'"
+if [ "x$JKJNIEXT" = "xtrunk" ]; then
+JKJNIVER=`svn info $SVNBASE | awk '$1 == "Revision:" {print $2}'`
 else
-  echo ""
-  echo "Problem finding apr source in $apr_src_dir."
-  echo "Use:"
-  echo "  --with-apr=[directory]" 
-  exit 1
+JKJNIVER=$JKJNIEXT
+JKJNIEXT="tags/other/TOMCAT_NATIVE_`echo $JKJNIVER | sed 's/\./_/g'`"
 fi
+echo "Using version: \`${JKJNIVER}'"
+
 
-# Replace JKJNIEXT with branch/or tag
-# and JKJNIVER by the version like 1.1.0
-# DON't forget to update native/include/tcn_version.h
-# and native/os/win32/libtcnative.rc
-# #define TCN_VERSION "1.1.14"
-# FILEVERSION 1,1,14,0
-# PRODUCTVERSION 1,1,14,0
-JKJNIEXT="tags/other/TOMCAT_NATIVE_1_1_15"
-JKJNIVER="1.1.15"
-#JKJNIEXT="trunk"
-#JKJNIVER="current"
-SVNBASE=https://svn.apache.org/repos/asf/tomcat/connectors/
 JKJNIDIST=tomcat-native-${JKJNIVER}-src
+
 rm -rf ${JKJNIDIST}
 mkdir -p ${JKJNIDIST}/jni
-svn export $SVNBASE/${JKJNIEXT}/jni/native ${JKJNIDIST}/jni/native
-if [ $? -ne 0 ]; then
-  echo "svn export native failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/java ${JKJNIDIST}/jni/java
-if [ $? -ne 0 ]; then
-  echo "svn export java failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/build.xml ${JKJNIDIST}/jni/build.xml
-if [ $? -ne 0 ]; then
-  echo "svn export build.xml failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/build.properties.sample 
${JKJNIDIST}/jni/build.properties.sample
-if [ $? -ne 0 ]; then
-  echo "svn export build.xml failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/examples ${JKJNIDIST}/jni/examples
-if [ $? -ne 0 ]; then
-  echo "svn export examples failed"
-  exit 1
-fi
-svn export $SVNBASE/${JKJNIEXT}/jni/test ${JKJNIDIST}/jni/test
-if [ $? -ne 0 ]; then
-  echo "svn export test failed"
-  exit 1
-fi
+for i in native java xdocs examples test build.xml build.properties.sample
+do
+svn export $SVNBASE/${JKJNIEXT}/jni/${i} ${JKJNIDIST}/jni/${i}
+if [ $? -ne 0 ]; then
+echo "svn export ${i} failed"
+exit 1
+fi
+done
+
+top="`pwd`"
+cd ${JKJNIDIST}/jni/xdocs
+ant
+$EXPTOOL $EXP

svn commit: r740040 - /tomcat/connectors/branches/native/1.1.x/STATUS.txt

2009-02-02 Thread mturk

Author: mturk
Date: Mon Feb  2 17:03:14 2009
New Revision: 740040

URL: http://svn.apache.org/viewvc?rev=740040&view=rev
Log:
Add patches proposal file

Added:
tomcat/connectors/branches/native/1.1.x/STATUS.txt   (with props)

Added: tomcat/connectors/branches/native/1.1.x/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/branches/native/1.1.x/STATUS.txt?rev=740040&view=auto
==
--- tomcat/connectors/branches/native/1.1.x/STATUS.txt (added)
+++ tomcat/connectors/branches/native/1.1.x/STATUS.txt Mon Feb  2 17:03:14 2009
@@ -0,0 +1,32 @@
+
+  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.
+
+
+$Revision: 730591 $ $Date: 2009-01-01 20:03:27 +0100 (Thu, 01 Jan 2009) $
+
+
+Apache Tomcat Native 1.1 Patch Proposals
+
+
+
+RELEASE SHOWSTOPPERS:
+
+
+PATCHES ACCEPTED TO BACKPORT:
+  [ start all new proposals below, under PATCHES PROPOSED. ]
+
+PATCHES PROPOSED TO BACKPORT:
+  [ New proposals should be added at the end of the list ]

Propchange: tomcat/connectors/branches/native/1.1.x/STATUS.txt
--
svn:eol-style = native



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

patch proposal

2009-02-02 Thread Giannini Alessandro

This patch is useful when you want handle keystore password from external 
class. 
To do this, I added two additional parameters (in Connector tag of server.xml) 
to call external method and get Password String.
 
- Parameter keystorePassHandler (in form some.package.Class.methodToInvoke)
- Parameter truststorePassHandler (in form some.package.Class.methodToInvoke) 
 
obviously, if not present,  keystorePass and truststorePass parameters are used.
 
Example:
using external attached passConsole.jar to enter password from console 
add attribute to Connector tag of server.xml
 
  
   
If new attributes are presents,keystorePass and truststorePass are ignored. 
 
 
 



INFORMATIVA SULLA PRIVACY
Ai sensi del D.Lgs. 196/2003 si precisa che le informazioni contenute
in questo messaggio e nei suoi eventuali allegati sono riservate e per
uso esclusivo del destinatario. Nessuno, all'infuori dello stesso,
può copiare o distribuire il messaggio, o parte di esso, a terzi.
Chiunque riceva questo messaggio per errore è pregato di distruggerlo
e di informare il mittente.

PRIVACY NOTICE
According to the D.Lgs. 196/2003 this document and its attachments are
confidential and intended for the named addressee(s) only. If you are
not the intended recipient of this message, any use or dissemination
of this message is prohibited. If you have received this document by
mistake, please notify the sender and destroy all physical and/or
electronic copies.


passConsole.jar
Description: passConsole.jar
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

DO NOT REPLY [Bug 46652] New: HttpServletRequest.getQueryString() always returns null

2009-02-02 Thread bugzilla

https://issues.apache.org/bugzilla/show_bug.cgi?id=46652

   Summary: HttpServletRequest.getQueryString() always returns null
   Product: Tomcat 6
   Version: unspecified
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: major
  Priority: P2
 Component: Servlet & JSP API
AssignedTo: dev@tomcat.apache.org
ReportedBy: j...@leeclemens.net


request.getQueryString() in a JSP always returns null.

To reproduce:

Create test JSP page, test.jsp, with scriptlet

<%
String qryStr = request.getQueryString();
if (qryStr==null) {
out.writeln("Query String is null!);
} else {
out.writeln("Query String is: " + qryStr);
}
%>

Type "http:test.jsp?a=1&b=2" in your browser (IE 6 SP2)

Query String is null! is displayed


Expected result:

Query String is: a=1&b=2


-- 
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: patch proposal

2009-02-02 Thread Mark Thomas

Giannini Alessandro wrote:
> This patch is useful when you want handle keystore password from external 
> class. 
> To do this, I added two additional parameters (in Connector tag of 
> server.xml) to call external method and get Password String.
>  
> - Parameter keystorePassHandler (in form some.package.Class.methodToInvoke)
> - Parameter truststorePassHandler (in form some.package.Class.methodToInvoke) 
>  
> obviously, if not present,  keystorePass and truststorePass parameters are 
> used.

Thanks for the suggested change. Please create a bugzilla entry for this
enhancement and attach your patch so it doesn't get overlooked.

Thanks,

Mark

>  
> Example:
> using external attached passConsole.jar to enter password from console 
> add attribute to Connector tag of server.xml
>  
>   port="8443" minProcessors="5" maxProcessors="75"
>enableLookups="false" disableUploadTimeout="true" 
>acceptCount="100"  maxThreads="200"
>scheme="https" secure="true" SSLEnabled="true"
>keystoreFile="C:/keystore/cert.p12"
>keystoreType="PKCS12" keystorePass="keypass"
>keystorePassHandler="it.urmet.test.EnterPassword.consolePassword"
>truststoreFile="C:/keystore/.keystore"
>truststorePassHandler="it.urmet.test.EnterPassword.consolePassword"
>truststoreType="JKS" truststorePass="trustorepass"
>clientAuth="true" sslprotocol="TLS"/>
>
> If new attributes are presents,keystorePass and truststorePass are ignored. 
>  
>  
>  
> 
> 
> 
> INFORMATIVA SULLA PRIVACY
> Ai sensi del D.Lgs. 196/2003 si precisa che le informazioni contenute
> in questo messaggio e nei suoi eventuali allegati sono riservate e per
> uso esclusivo del destinatario. Nessuno, all'infuori dello stesso,
> può copiare o distribuire il messaggio, o parte di esso, a terzi.
> Chiunque riceva questo messaggio per errore è pregato di distruggerlo
> e di informare il mittente.
> 
> PRIVACY NOTICE
> According to the D.Lgs. 196/2003 this document and its attachments are
> confidential and intended for the named addressee(s) only. If you are
> not the intended recipient of this message, any use or dissemination
> of this message is prohibited. If you have received this document by
> mistake, please notify the sender and destroy all physical and/or
> electronic copies.
> 
> 
> 
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r740042 - /tomcat/connectors/branches/native/1.1.x/jni/jnirelease.sh

svn commit: r740038 - /tomcat/connectors/trunk/jni/jnirelease.sh

svn commit: r740040 - /tomcat/connectors/branches/native/1.1.x/STATUS.txt

patch proposal

DO NOT REPLY [Bug 46652] New: HttpServletRequest.getQueryString() always returns null

Re: patch proposal

6 matches

Site Navigation

Mail list logo

Footer information