[Proposal] mod_jk lb changes

[Rainer Jung]

Hi List, hi Mladen (master of mod_jk):

a year ago we changed to algorithm in mod_jk, that "counts" weighted 
requests in the lb worker to decide, which balanced worker should 
receive the next request.


The new algorithm three main advantages:

a) using only integers
b) using only a limited range of values
c) behaving well when one balanced worker went out of service for a 
longer time and then came back


Unfortunately the algorithm has another deficiency and I propose to do 
it in yet another way.


The problem is: the algo needs to update counters on all balanced 
workers not only on the worker that gets the request. No in more complex 
balancer configurations we have different groups of workers eligible for 
a request. A request might carry a session and the right worker is dwn, 
then the whole domain (replicas) are eligible. A request might not carry 
a session, then all available workers are eligible. Although we have 
different groups depending on the type of request and the status of the 
workers we only update one common set of load counters. This leads to 
incorrect balancing decisions, whenever these situations get mixed.


My proposal is to go back basically to the old way of doing it, but with 
an implementation, that still respects a) and c) and to some extend also b).


A) During initialization we calculate the smallest common multiple L of 
all balancing weights (lb factor) l_1,...,l_n and set 
L_1=L/l_1,...,L_n=L/l_n. That's cheap, the algo is well known and all is 
exact integer operations.


B) We use a 64Bit load counter and for each request we do not only add 
1, instead we add L_i whenever worker i gets chosen.


C) We always choose the eligible worker with the smallest load counter 
(and we can use a rotating offset like it is already implemented for 
traffic).


D) During maintenance we divide all load counters by some constant. Best 
would be a power of 2, so we can simply shift right all load counters. 
This way we shape the counters with a simple approximation of an 
exponential curve, so the influence of incrementing the counters in the 
past gets less important the longer away it is.


E) If we divide in D) by 2 each minute, then the counters will never 
exceed 2 times the maximum a counter can reach in a single minute.  For 
most weight factors and loads this will easily fit into a 64 Bit 
integer. We can furthermore care about overflows by prematurely shifting 
right whenever the counters get to big (with very high load aging the 
counters earlier on demand).


I could supply a patch including documentation. I think that would be 
low risk, because that patch would only influence how the load counters 
are handled, and would not interfere with changing worker status and 
decision logic.


Comments?

Rainer

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393433 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup: Bootstrap.java ClassLoaderFactory.java

[remm]

Author: remm
Date: Wed Apr 12 03:54:41 2006
New Revision: 393433

URL: http://svn.apache.org/viewcvs?rev=393433&view=rev
Log:
- Improve the algorithm used when constructing classloaders, in particular to 
respect order.
- Submitted by Rainer Jung.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ClassLoaderFactory.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=393433&r1=393432&r2=393433&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Bootstrap.java Wed 
Apr 12 03:54:41 2006
@@ -1,498 +1,517 @@
-/*
- * Copyright 1999,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * 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.
- */
-
-
-package org.apache.catalina.startup;
-
-
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-import javax.management.ObjectName;
-
-import org.apache.catalina.security.SecurityClassLoad;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-
-/**
- * Boostrap loader for Catalina.  This application constructs a class loader
- * for use in loading the Catalina internal classes (by accumulating all of the
- * JAR files found in the "server" directory under "catalina.home"), and
- * starts the regular execution of the container.  The purpose of this
- * roundabout approach is to keep the Catalina internal classes (and any
- * other classes they depend on, such as an XML parser) out of the system
- * class path and therefore not visible to application level classes.
- *
- * @author Craig R. McClanahan
- * @author Remy Maucherat
- * @version $Revision: 304108 $ $Date: 2005-09-29 07:55:15 +0200 (jeu., 29 
sept. 2005) $
- */
-
-public final class Bootstrap {
-
-private static Log log = LogFactory.getLog(Bootstrap.class);
-
-// -- Constants
-
-
-protected static final String CATALINA_HOME_TOKEN = "${catalina.home}";
-protected static final String CATALINA_BASE_TOKEN = "${catalina.base}";
-
-
-// --- Static Variables
-
-
-private static final String JMX_ERROR_MESSAGE =
-"This release of Apache Tomcat was packaged to run on J2SE 5.0 \n"
-+ "or later. It can be run on earlier JVMs by downloading and \n"
-+ "installing a compatibility package from the Apache Tomcat \n"
-+ "binary download page.";
-
-
-/**
- * Daemon object used by main.
- */
-private static Bootstrap daemon = null;
-
-
-// -- Variables
-
-
-/**
- * Daemon reference.
- */
-private Object catalinaDaemon = null;
-
-
-protected ClassLoader commonLoader = null;
-protected ClassLoader catalinaLoader = null;
-protected ClassLoader sharedLoader = null;
-
-
-//  Private Methods
-
-
-private void initClassLoaders() {
-try {
-commonLoader = createClassLoader("common", null);
-if( commonLoader == null ) {
-// no config file, default to this loader - we might be in a 
'single' env.
-commonLoader=this.getClass().getClassLoader();
-}
-catalinaLoader = createClassLoader("server", commonLoader);
-sharedLoader = createClassLoader("shared", commonLoader);
-} catch (Throwable t) {
-log.error("Class loader creation threw exception", t);
-System.exit(1);
-}
-}
-
-
-private ClassLoader createClassLoader(String name, ClassLoader parent)
-throws Exception {
-
-String value = CatalinaProperties.getProperty(name + ".loader");
-if ((value == null) || (value.equals("")))
-return parent;
-
-ArrayList unpackedList = new ArrayList();
-ArrayList packedList = new Arra

svn commit: r393434 - in /tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup: Bootstrap.java ClassLoaderFactory.java

[remm]

Author: remm
Date: Wed Apr 12 03:55:14 2006
New Revision: 393434

URL: http://svn.apache.org/viewcvs?rev=393434&view=rev
Log:
- Improve the algorithm used when constructing classloaders, in particular to 
respect order.
- Submitted by Rainer Jung.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/Bootstrap.java

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/Bootstrap.java?rev=393434&r1=393433&r2=393434&view=diff
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/Bootstrap.java
 Wed Apr 12 03:55:14 2006
@@ -115,50 +115,69 @@
 if ((value == null) || (value.equals("")))
 return parent;
 
-ArrayList unpackedList = new ArrayList();
-ArrayList packedList = new ArrayList();
-ArrayList urlList = new ArrayList();
-
+ArrayList repositoryLocations = new ArrayList();
+ArrayList repositoryTypes = new ArrayList();
+int i;
+ 
 StringTokenizer tokenizer = new StringTokenizer(value, ",");
 while (tokenizer.hasMoreElements()) {
 String repository = tokenizer.nextToken();
 
 // Local repository
-boolean packed = false;
-if (repository.startsWith(CATALINA_HOME_TOKEN)) {
-repository = getCatalinaHome()
-+ repository.substring(CATALINA_HOME_TOKEN.length());
-} else if (repository.startsWith(CATALINA_BASE_TOKEN)) {
-repository = getCatalinaBase()
-+ repository.substring(CATALINA_BASE_TOKEN.length());
+boolean replace = false;
+String before = repository;
+while ((i=repository.indexOf(CATALINA_HOME_TOKEN))>=0) {
+replace=true;
+if (i>0) {
+repository = repository.substring(0,i) + getCatalinaHome() 
++ repository.substring(i+CATALINA_HOME_TOKEN.length());
+} else {
+repository = getCatalinaHome() 
++ repository.substring(CATALINA_HOME_TOKEN.length());
+}
+}
+while ((i=repository.indexOf(CATALINA_BASE_TOKEN))>=0) {
+replace=true;
+if (i>0) {
+repository = repository.substring(0,i) + getCatalinaBase() 
++ repository.substring(i+CATALINA_BASE_TOKEN.length());
+} else {
+repository = getCatalinaBase() 
++ repository.substring(CATALINA_BASE_TOKEN.length());
+}
 }
+if (replace && log.isDebugEnabled())
+log.debug("Expanded " + before + " to " + replace);
 
 // Check for a JAR URL repository
 try {
-urlList.add(new URL(repository));
+URL url=new URL(repository);
+repositoryLocations.add(repository);
+repositoryTypes.add(ClassLoaderFactory.IS_URL);
 continue;
 } catch (MalformedURLException e) {
 // Ignore
 }
 
 if (repository.endsWith("*.jar")) {
-packed = true;
 repository = repository.substring
 (0, repository.length() - "*.jar".length());
-}
-if (packed) {
-packedList.add(new File(repository));
+repositoryLocations.add(repository);
+repositoryTypes.add(ClassLoaderFactory.IS_GLOB);
+} else if (repository.endsWith(".jar")) {
+repositoryLocations.add(repository);
+repositoryTypes.add(ClassLoaderFactory.IS_JAR);
 } else {
-unpackedList.add(new File(repository));
+repositoryLocations.add(repository);
+repositoryTypes.add(ClassLoaderFactory.IS_DIR);
 }
 }
 
-File[] unpacked = (File[]) unpackedList.toArray(new File[0]);
-File[] packed = (File[]) packedList.toArray(new File[0]);
-URL[] urls = (URL[]) urlList.toArray(new URL[0]);
-
+String[] locations = (String[]) repositoryLocations.toArray(new 
String[0]);
+Integer[] types = (Integer[]) repositoryTypes.toArray(new Integer[0]);
+ 
 ClassLoader classLoader = ClassLoaderFactory.createClassLoader
-(unpacked, packed, urls, parent);
+(locations, types, parent);
 
 // Retrieving MBean server
 MBeanServer mBeanServer = null;
@@

svn commit: r393447 - in /tomcat/container/tc5.5.x: modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java webapps/docs/changelog.xml

[pero]

Author: pero
Date: Wed Apr 12 05:39:05 2006
New Revision: 393447

URL: http://svn.apache.org/viewcvs?rev=393447&view=rev
Log:
Fix that DeltaManager not set session creation time at backup nodes.

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java?rev=393447&r1=393446&r2=393447&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java
 Wed Apr 12 05:39:05 2006
@@ -626,6 +626,7 @@
 SessionMessage msg = new SessionMessageImpl(getName(),
 SessionMessage.EVT_SESSION_CREATED, null, sessionId,
 sessionId + "-" + System.currentTimeMillis());
+msg.setTimestamp(session.getCreationTime());
 if (log.isDebugEnabled())
 log.debug(sm.getString("deltaManager.sendMessage.newSession",
 name, sessionId));
@@ -1621,6 +1622,7 @@
 session.setManager(this);
 session.setValid(true);
 session.setPrimarySession(false);
+session.setCreationTime(msg.getTimestamp());
 session.access();
 if(notifySessionListenersOnReplication)
 session.setId(msg.getSessionID());

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393447&r1=393446&r2=393447&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Apr 12 05:39:05 2006
@@ -105,6 +105,9 @@
   
   
 
+   
+ DeltaManager set session creationTime at backup node. (pero)
+   

 Add JvmRouteBinderValve documentation at cluster-howto.xml. (pero)




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393449 - in /tomcat/container/tc5.5.x: modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml webapps/docs/changelog.xml

[pero]

Author: pero
Date: Wed Apr 12 05:52:48 2006
New Revision: 393449

URL: http://svn.apache.org/viewcvs?rev=393449&view=rev
Log:
Add useful PooledSocketSender jmx state attributes

Modified:

tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml?rev=393449&r1=393448&r2=393449&view=diff
==
--- 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
 (original)
+++ 
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/tcp/mbeans-descriptors.xml
 Wed Apr 12 05:52:48 2006
@@ -771,6 +771,12 @@
 
+
+ 
 

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393449&r1=393448&r2=393449&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Apr 12 05:52:48 2006
@@ -105,6 +105,9 @@
   
   
 
+   
+Add at PooledSocketSender the jmx attributes inPoolSize and 
inUsePoolSize. (pero)
+   

  DeltaManager set session creationTime at backup node. (pero)




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393451 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

[pero]

Author: pero
Date: Wed Apr 12 05:57:09 2006
New Revision: 393451

URL: http://svn.apache.org/viewcvs?rev=393451&view=rev
Log:
Report wrong jnilib flag switch.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393451&r1=393450&r2=393451&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Apr 12 05:57:09 2006
@@ -93,6 +93,10 @@
   
 Replace java.util.Stack usage with a simple array in the APR endpoint 
(remm)
   
+  
+tcnative jnilib.c now report correct compile flags for runtime 
+Library.java checks like sendfile support default true/false (pero)
+  
 
   
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r392872 - /tomcat/tc6.0.x/trunk/build.xml

[Remy Maucherat]

Bill Barker wrote:

I mostly favor keeping the JavaMail support, since removing it (or even
making it a separate download) is likely to generate a flood of BZ reports
from people that can't be bothered to read the docs :).  It has been there
since TC 4.0.0, so a lot of people are going to expect to just drop their
old war into TC 6 and have it work.


Ok, I thought about it some more, and I would like to keep the JavaMail 
support present.


About the APIs, I think we should (eventually) use SVN links to the 
proper folders in https://svn.apache.org/repos/asf/geronimo/specs/trunk 
and make them part of (in a virtual way) our source tree. For now 
(especially since the new APIs are not there yet), I will continue 
putting temporary stuff in the javax. folder to make sure everything builds.


Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393454 - in /tomcat/tc6.0.x/trunk/java/javax: annotation/ annotation/security/ mail/ mail/internet/ persistence/ servlet/resources/ xml/ xml/ws/

[remm]

Author: remm
Date: Wed Apr 12 06:18:19 2006
New Revision: 393454

URL: http://svn.apache.org/viewcvs?rev=393454&view=rev
Log:
- Update APIs and annotations.

Added:
tomcat/tc6.0.x/trunk/java/javax/annotation/EJB.java
tomcat/tc6.0.x/trunk/java/javax/annotation/EJBs.java
tomcat/tc6.0.x/trunk/java/javax/mail/
tomcat/tc6.0.x/trunk/java/javax/mail/Authenticator.java
tomcat/tc6.0.x/trunk/java/javax/mail/PasswordAuthentication.java
tomcat/tc6.0.x/trunk/java/javax/mail/Session.java
tomcat/tc6.0.x/trunk/java/javax/mail/internet/
tomcat/tc6.0.x/trunk/java/javax/mail/internet/InternetAddress.java
tomcat/tc6.0.x/trunk/java/javax/mail/internet/MimeMessage.java
tomcat/tc6.0.x/trunk/java/javax/mail/internet/MimePart.java
tomcat/tc6.0.x/trunk/java/javax/mail/internet/MimePartDataSource.java
tomcat/tc6.0.x/trunk/java/javax/persistence/
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContext.java
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceContexts.java
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceUnit.java
tomcat/tc6.0.x/trunk/java/javax/persistence/PersistenceUnits.java
tomcat/tc6.0.x/trunk/java/javax/xml/
tomcat/tc6.0.x/trunk/java/javax/xml/ws/
tomcat/tc6.0.x/trunk/java/javax/xml/ws/WebServiceRef.java
tomcat/tc6.0.x/trunk/java/javax/xml/ws/WebServiceRefs.java
Modified:
tomcat/tc6.0.x/trunk/java/javax/annotation/Generated.java
tomcat/tc6.0.x/trunk/java/javax/annotation/PostConstruct.java
tomcat/tc6.0.x/trunk/java/javax/annotation/PreDestroy.java
tomcat/tc6.0.x/trunk/java/javax/annotation/Resource.java
tomcat/tc6.0.x/trunk/java/javax/annotation/Resources.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/DeclaresRoles.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/DenyAll.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/PermitAll.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/RolesAllowed.java
tomcat/tc6.0.x/trunk/java/javax/annotation/security/RunAs.java
tomcat/tc6.0.x/trunk/java/javax/servlet/resources/web-app_2_4.xsd

Added: tomcat/tc6.0.x/trunk/java/javax/annotation/EJB.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/javax/annotation/EJB.java?rev=393454&view=auto
==
--- tomcat/tc6.0.x/trunk/java/javax/annotation/EJB.java (added)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/EJB.java Wed Apr 12 06:18:19 2006
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.
+ */
+
+
+package javax.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
[EMAIL PROTECTED]({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD, 
ElementType.PARAMETER})
[EMAIL PROTECTED](RetentionPolicy.RUNTIME)
+
+public @interface EJB {
+   String name() default "";
+   Class businessInterface() default java.lang.Object.class;
+   String beanName() default "";
+   String mappedName() default "";
+   String description() default "";
+}

Added: tomcat/tc6.0.x/trunk/java/javax/annotation/EJBs.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/javax/annotation/EJBs.java?rev=393454&view=auto
==
--- tomcat/tc6.0.x/trunk/java/javax/annotation/EJBs.java (added)
+++ tomcat/tc6.0.x/trunk/java/javax/annotation/EJBs.java Wed Apr 12 06:18:19 
2006
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * 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.
+ */
+
+
+package javax.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
[EMAIL PRO

svn commit: r393457 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina: startup/WebAnnotationSet.java util/AnnotationProcessor.java

[remm]

Author: remm
Date: Wed Apr 12 06:32:02 2006
New Revision: 393457

URL: http://svn.apache.org/viewcvs?rev=393457&view=rev
Log:
- Add resource injection for all annotations that are supposed to be supported 
by the web tier.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java?rev=393457&r1=393456&r2=393457&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/WebAnnotationSet.java 
Wed Apr 12 06:32:02 2006
@@ -33,9 +33,6 @@
 import org.apache.catalina.deploy.FilterDef;
 import org.apache.catalina.deploy.MessageDestinationRef;
 
-//import javax.ejb.EJB;
-//import javax.xml.ws.WebServiceRef;
-
 /**
  * AnnotationSet for processing the annotations of the web 
application
  * classes (/WEB-INF/classes and /WEB-INF/lib).

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java?rev=393457&r1=393456&r2=393457&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/AnnotationProcessor.java 
Wed Apr 12 06:32:02 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,13 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import javax.annotation.EJB;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.naming.NamingException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import javax.xml.ws.WebServiceRef;
 
 import org.apache.tomcat.util.IntrospectionUtils;
 
@@ -116,18 +120,25 @@
 Resource annotation = (Resource) 
fields[i].getAnnotation(Resource.class);
 lookupFieldResource(context, instance, fields[i], 
annotation.name());
 }
-/*
 if (fields[i].isAnnotationPresent(EJB.class)) {
 EJB annotation = (EJB) fields[i].getAnnotation(EJB.class);
-lookupOnFieldResource(context, instance, fields[i], 
annotation.name());
+lookupFieldResource(context, instance, fields[i], 
annotation.name());
 }
-
 if (fields[i].isAnnotationPresent(WebServiceRef.class)) {
 WebServiceRef annotation = 
 (WebServiceRef) 
fields[i].getAnnotation(WebServiceRef.class);
-lookupOnFieldResource(context, instance, fields[i], 
annotation.name());
+lookupFieldResource(context, instance, fields[i], 
annotation.name());
+}
+if (fields[i].isAnnotationPresent(PersistenceContext.class)) {
+PersistenceContext annotation = 
+(PersistenceContext) 
fields[i].getAnnotation(PersistenceContext.class);
+lookupFieldResource(context, instance, fields[i], 
annotation.name());
+}
+if (fields[i].isAnnotationPresent(PersistenceUnit.class)) {
+PersistenceUnit annotation = 
+(PersistenceUnit) 
fields[i].getAnnotation(PersistenceUnit.class);
+lookupFieldResource(context, instance, fields[i], 
annotation.name());
 }
-*/
 }
 
 // Initialize methods annotations
@@ -137,18 +148,26 @@
 Resource annotation = (Resource) 
methods[i].getAnnotation(Resource.class);
 lookupMethodResource(context, instance, methods[i], 
annotation.name());
 }
-/*
 if (methods[i].isAnnotationPresent(EJB.class)) {
 EJB annotation = (EJB) methods[i].getAnnotation(EJB.class);
-lookupOnMethodResource(context, instance, methods[i], 
annotation.name());
+lookupMethodResource(context, instance, methods[i], 
annotation.name());
 }
 if (methods[i].isAnnotationPresent(WebServiceRef.class)) {
 WebServiceRef annotation = 
 (WebServiceRef) 
methods[i].getAnnotation(WebServiceRef.class);
-lookupOnMethodResource(context, instance, methods[i], 
annotation.name());
+loo

svn commit: r393458 - in /tomcat/tc6.0.x/trunk: .classpath build.xml

[remm]

Author: remm
Date: Wed Apr 12 06:34:17 2006
New Revision: 393458

URL: http://svn.apache.org/viewcvs?rev=393458&view=rev
Log:
- Update JAR packaging.

Modified:
tomcat/tc6.0.x/trunk/.classpath
tomcat/tc6.0.x/trunk/build.xml

Modified: tomcat/tc6.0.x/trunk/.classpath
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/.classpath?rev=393458&r1=393457&r2=393458&view=diff
==
--- tomcat/tc6.0.x/trunk/.classpath (original)
+++ tomcat/tc6.0.x/trunk/.classpath Wed Apr 12 06:34:17 2006
@@ -1,6 +1,6 @@
 
 
-   
+   




Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/build.xml?rev=393458&r1=393457&r2=393458&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Apr 12 06:34:17 2006
@@ -54,23 +54,13 @@
 
 
 
-
-
   
 
   
   
 
 
-
-  
-
-
-  
-
-
+
 
 
 
@@ -92,10 +82,6 @@
excludes="**/CVS/**,**/.svn/**">
   
   
-  
-  
 
 
 
@@ -117,7 +103,10 @@
 
 
   
-
+
+
+
+
 
 
 
@@ -149,7 +138,7 @@
 
 
   
-
+
 
 
 
@@ -197,17 +186,8 @@
 
   

-
-   
-
-
-  
-
-
-   
-
-  

+

 
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 39218] - Wrong order in TC class loading

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39218


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-04-12 15:31 ---
Fixed. Thanks.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393491 - in /tomcat/tc6.0.x/trunk: build.properties.default build.xml

[remm]

Author: remm
Date: Wed Apr 12 09:01:42 2006
New Revision: 393491

URL: http://svn.apache.org/viewcvs?rev=393491&view=rev
Log:
- Add the usual download target (including building JDT and DBCP).

Modified:
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml

Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/build.properties.default?rev=393491&r1=393490&r2=393491&view=diff
==
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Wed Apr 12 09:01:42 2006
@@ -20,6 +20,8 @@
 compile.source=1.5
 compile.target=1.5
 
+base-jakarta.loc=http://archive.apache.org/dist/jakarta
+
 # - Commons Logging, version 1.0.1 or later -
 commons-logging.home=${base.path}/commons-logging-1.0.4
 commons-logging.lib=${commons-logging.home}
@@ -34,6 +36,23 @@
 
jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-JDT-3.1.2.zip
 
 # - Tomcat native library -
-tomcat-native.home=${base.path}/tomcat-native-1.1.2
+tomcat-native.home=${base.path}/tomcat-native-1.1.3
 tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
-tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.2.tar.gz
+tomcat-native.loc=${base-tomcat.loc}/tomcat-connectors/native/tomcat-native-1.1.3.tar.gz
+
+# - Commons DBCP, version 1.1 or later -
+commons-dbcp.version=1.2.1
+commons-dbcp.home=${base.path}/commons-dbcp-1.2.1
+commons-dbcp-src.loc=${base-jakarta.loc}/commons/dbcp/source/commons-dbcp-1.2.1-src.tar.gz
+
+# - Commons Pool, version 1.1 or later -
+commons-pool.home=${base.path}/commons-pool-1.2
+commons-pool-src.loc=${base-jakarta.loc}/commons/pool/source/commons-pool-1.2-src.tar.gz
+
+# - Commons Collections, version 2.0 or later -
+commons-collections.home=${base.path}/commons-collections-3.1
+commons-collections.lib=${commons-collections.home}
+commons-collections.jar=${commons-collections.lib}/commons-collections-3.1.jar
+commons-collections.loc=${base-jakarta.loc}/commons/collections/binaries/commons-collections-3.1.tar.gz
+commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.1-src.tar.gz
+

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/tc6.0.x/trunk/build.xml?rev=393491&r1=393490&r2=393491&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Apr 12 09:01:42 2006
@@ -33,7 +33,7 @@
 
   
   
-  
+
   
   
 
@@ -48,7 +48,12 @@
 
   
   
-  
+
+  
+  
+  
+  
+
   
   
 
@@ -62,7 +67,7 @@
 
 
 
-
+
 
 
 
@@ -98,7 +103,7 @@
 
   
 
-
+  
 
 
 
@@ -160,7 +165,7 @@
 
 
 
-   
+
 
 
   
@@ -185,10 +190,10 @@
 
 
   
-   
-   
+
+
 
-   
+
 
 
   
@@ -217,15 +222,32 @@
   
 
 
- 
- 
-   
- 
- 
- 
- 
-   
- 
+
+
+  
+
+
+
+
+  
+
+
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+  
+
+  
+
 
   
 
@@ -241,18 +263,153 @@
   
 
 
-
+
 
   
 
   
 
 
+
+
+
   
 
   
 
 
   
-  
+
+  
+  
+
+
+
+  
+
+  
+
+
+  
+
+  
+
+
+
+
+
+
+  
+
+  
+
+
+
+
+
+  
+
+  
+
+
+  
+  
+
+
+
+
+  
+  
+
+
+  
+  
+
+
+  
+  
+
+
+
+  
+
+
+
+
+  
+  
+  
+
+
+
+  
+
+
+  
+
+  
+
+  
+
+
+
+
+  
+  
+
+
+
+
+  
+  
+
+
+  
+
+
+  
+  
+
+
+  
+
+
+
+  
+
+
+
+  
+
+
+  
+
+
+  
+
+  
+
+  
+
+
+  
+
+
+
+  
+
+  
+
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 35064] - Admin WebApp fails to open connectors when clicked.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35064


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |




-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

RE: svn commit: r393433 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup: Bootstrap.java ClassLoaderFactory.java

[Bill Barker]

 

> -Original Message-
> From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] 
> Sent: Wednesday, April 12, 2006 3:55 AM
> To: tomcat-dev@jakarta.apache.org
> Subject: svn commit: r393433 - in 
> /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup: 
> Bootstrap.java ClassLoaderFactory.java
> 
> Author: remm
> Date: Wed Apr 12 03:54:41 2006
> New Revision: 393433
> 
> URL: http://svn.apache.org/viewcvs?rev=393433&view=rev
> Log:
> - Improve the algorithm used when constructing classloaders, 
> in particular to respect order.
> - Submitted by Rainer Jung.
> 

Urm, I think we need svn:eol-style = native in the TC6 repo :).



This message is intended only for the use of the person(s) listed above as the 
intended recipient(s), and may contain information that is PRIVILEGED and 
CONFIDENTIAL.  If you are not an intended recipient, you may not read, copy, or 
distribute this message or any attachment. If you received this communication 
in error, please notify us immediately by e-mail and then delete all copies of 
this message and any attachments.

In addition you should be aware that ordinary (unencrypted) e-mail sent through 
the Internet is not secure. Do not send confidential or sensitive information, 
such as social security numbers, account numbers, personal identification 
numbers and passwords, to us via ordinary (unencrypted) e-mail.


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Build failing

[Filip Hanik - Dev lists]

It expects there to be a tomcat-native-1.1.3 referenced in the build file
http://archive.apache.org/dist/tomcat/tomcat-connectors/native/

either we change the build to download -current, or publish a 
1.1.3.tar.gz file,


anyone up for the task?

thanks
Filip

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Build failing

[Markus Schönhaber]

Filip Hanik - Dev lists wrote:
> It expects there to be a tomcat-native-1.1.3 referenced in the build file
> http://archive.apache.org/dist/tomcat/tomcat-connectors/native/
>
> either we change the build to download -current, or publish a
> 1.1.3.tar.gz file,
>
> anyone up for the task?

If I followed the discussion here on tomcat-dev correctly, the plan is to 
release tomcat-native 1.1.3 this Friday and to cut Tomcat 5.5.17 later the 
same day. So this will not be a problem for long.

What I did to make a trunk build today was to change the version number in 
tcnative's header file to 1.1.3, tar.gz it and place it where Tomcat's ant 
script expected it and the build completed successfully. I also built a 
tcnative-1.so from the patched source so that the new-built Tomcat would 
accept it.

Regards
  mks

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Build failing

[Remy Maucherat]

Filip Hanik - Dev lists wrote:

It expects there to be a tomcat-native-1.1.3 referenced in the build file
http://archive.apache.org/dist/tomcat/tomcat-connectors/native/

either we change the build to download -current, or publish a 
1.1.3.tar.gz file,


anyone up for the task?


The new tcnative will be released early friday. I preferred updating all 
numbers early rather than at the last minute to try to avoid the many 
problems which occurred last time. You can use your build.properties to 
override the tomcat-native.home property.


Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r393433 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup: Bootstrap.java ClassLoaderFactory.java

[Remy Maucherat]

Bill Barker wrote:

Author: remm
Date: Wed Apr 12 03:54:41 2006
New Revision: 393433

URL: http://svn.apache.org/viewcvs?rev=393433&view=rev
Log:
- Improve the algorithm used when constructing classloaders, 
in particular to respect order.

- Submitted by Rainer Jung.



Urm, I think we need svn:eol-style = native in the TC6 repo :).


+1. It is quite odd that the other repositories don't behave like that. 
Sorry, I can't adjust my client side properties (I'm using Tortoise).


Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Build failing

[Markus Schönhaber]

Remy Maucherat wrote:
> The new tcnative will be released early friday. I preferred updating all
> numbers early rather than at the last minute to try to avoid the many
> problems which occurred last time.

Hopefully I'm not stating the obvious but it should not be forgotten to also 
change tcnative's version number .

Regards
  mks



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393603 - /tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/coyote/tomcat5/InputBuffer.java

[fhanik]

Author: fhanik
Date: Wed Apr 12 13:42:48 2006
New Revision: 393603

URL: http://svn.apache.org/viewcvs?rev=393603&view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=38346
Fixed in 5.5 backporting to 5.0
Fixed provided by Rainer Jung

Modified:

tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/coyote/tomcat5/InputBuffer.java

Modified: 
tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/coyote/tomcat5/InputBuffer.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/coyote/tomcat5/InputBuffer.java?rev=393603&r1=393602&r2=393603&view=diff
==
--- 
tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/coyote/tomcat5/InputBuffer.java
 (original)
+++ 
tomcat/container/branches/tc5.0.x/catalina/src/share/org/apache/coyote/tomcat5/InputBuffer.java
 Wed Apr 12 13:42:48 2006
@@ -221,6 +221,7 @@
 if (cb.getChars().length > size) {
 cb = new CharChunk(size);
 cb.setLimit(size);
+cb.setOptimizedWrite(false);
 cb.setCharInputChannel(this);
 cb.setCharOutputChannel(this);
 } else {
@@ -350,6 +351,10 @@
 cb.setOffset(0);
 cb.setEnd(0);
 }
+
+int offset = bb.getLength()+cb.getStart();
+if ( cb.getLimit() < offset )
+cb.setLimit(offset);
 
 conv.convert(bb, cb);
 bb.setOffset(bb.getEnd());



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: patch for ManagerServlet (was Re: yet another tomcat goes stable and I still have to make a custom package)

[Haroon Rafique]

On Apr 6 at 9:54am, HR=>Haroon Rafique <[EMAIL PROTECTED]> wrote:

HR> On Mar 22 at 3:04pm, FHDL=>Filip Hanik - Dev Lists <[EMAIL PROTECTED]> 
wrote:
HR> 
HR> FH> patch looks good to me, +1,
HR> FH> if no objections arise, then I can submit, we'll wait until end of week.
HR> FH> Filip
HR> FH> 
HR> FH> http://issues.apache.org/bugzilla/attachment.cgi?id=17944
HR> FH> 
HR> 
HR> Any status on committing the above patch attached to bug 36847?
HR> 

I hear talk of cutting a 5.5.17 release later this week. I would love to 
see the above patch integrated into 5.5.17.

Thanks in Advance,
--
Haroon Rafique
<[EMAIL PROTECTED]>


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r393433 - in /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup: Bootstrap.java ClassLoaderFactory.java

[Mark Thomas]

Remy Maucherat wrote:
> Bill Barker wrote:
>> Urm, I think we need svn:eol-style = native in the TC6 repo :).
> 
> +1. It is quite odd that the other repositories don't behave like that.
> Sorry, I can't adjust my client side properties (I'm using Tortoise).

Yes you can. Steps as follows:
- right-click in any explorer window
- select "TortoiseSVN"
- select "Settings"
- select "General"
- select the "Edit" button next to "Subversion configuration file"
- copy the contents of http://www.apache.org/dev/svn-eol-style.txt to
the end of the file
- close notepad
- click "OK"

Mark


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393611 - /tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/log/SystemLogHandler.java

[fhanik]

Author: fhanik
Date: Wed Apr 12 13:57:55 2006
New Revision: 393611

URL: http://svn.apache.org/viewcvs?rev=393611&view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=33368
Already applied to 5.5, backport to 5.0
Fixed provided by Rainer Jung

Modified:

tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/log/SystemLogHandler.java

Modified: 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/log/SystemLogHandler.java
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/log/SystemLogHandler.java?rev=393611&r1=393610&r2=393611&view=diff
==
--- 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/log/SystemLogHandler.java
 (original)
+++ 
tomcat/connectors/branches/tc5.0.x/util/java/org/apache/tomcat/util/log/SystemLogHandler.java
 Wed Apr 12 13:57:55 2006
@@ -20,6 +20,7 @@
 import java.io.PrintStream;
 import java.util.Hashtable;
 import java.util.Stack;
+import java.util.EmptyStackException;
 
 /**
  * This helper class may be used to do sophisticated redirection of 
@@ -58,7 +59,7 @@
 /**
  * Thread <-> CaptureLog associations.
  */
-protected static Hashtable logs = new Hashtable();
+protected static ThreadLocal logs = new ThreadLocal();
 
 
 /**
@@ -75,19 +76,20 @@
  */
 public static void startCapture() {
 CaptureLog log = null;
-
-// Synchronized for Bugzilla 31018
-synchronized(reuse) {
-log = reuse.isEmpty() ? new CaptureLog() : (CaptureLog)reuse.pop();
+if (!reuse.isEmpty()) {
+try {
+log = (CaptureLog)reuse.pop();
+} catch (EmptyStackException e) {
+log = new CaptureLog();
+}
+} else {
+log = new CaptureLog();
 }
-
-Thread thread = Thread.currentThread();
-Stack stack = (Stack)logs.get(thread);
+Stack stack = (Stack)logs.get();
 if (stack == null) {
 stack = new Stack();
-logs.put(thread, stack);
+logs.set(stack);
 }
-
 stack.push(log);
 }
 
@@ -96,7 +98,7 @@
  * Stop capturing thread's output and return captured data as a String.
  */
 public static String stopCapture() {
-Stack stack = (Stack)logs.get(Thread.currentThread());
+Stack stack = (Stack)logs.get();
 if (stack == null || stack.isEmpty()) {
 return null;
 }
@@ -118,7 +120,7 @@
  * Find PrintStream to which the output must be written to.
  */
 protected PrintStream findStream() {
-Stack stack = (Stack)logs.get(Thread.currentThread());
+Stack stack = (Stack)logs.get();
 if (stack != null && !stack.isEmpty()) {
 CaptureLog log = (CaptureLog)stack.peek();
 if (log != null) {



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393612 - /tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/util/SystemLogHandler.java

[fhanik]

Author: fhanik
Date: Wed Apr 12 13:58:10 2006
New Revision: 393612

URL: http://svn.apache.org/viewcvs?rev=393612&view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=33368
Already applied to 5.5, backport to 5.0
Fixed provided by Rainer Jung

Modified:

tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/util/SystemLogHandler.java

Modified: 
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/util/SystemLogHandler.java
URL: 
http://svn.apache.org/viewcvs/tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/util/SystemLogHandler.java?rev=393612&r1=393611&r2=393612&view=diff
==
--- 
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/util/SystemLogHandler.java
 (original)
+++ 
tomcat/jasper/branches/tc5.0.x/jasper2/src/share/org/apache/jasper/util/SystemLogHandler.java
 Wed Apr 12 13:58:10 2006
@@ -55,13 +55,13 @@
 /**
  * Thread <-> PrintStream associations.
  */
-protected static Hashtable streams = new Hashtable();
+protected static ThreadLocal streams = new ThreadLocal();
 
 
 /**
  * Thread <-> ByteArrayOutputStream associations.
  */
-protected static Hashtable data = new Hashtable();
+protected static ThreadLocal data = new ThreadLocal();
 
 
 // - Public Methods
@@ -76,9 +76,8 @@
  */
 public static void setThread() {
 ByteArrayOutputStream baos = new ByteArrayOutputStream();
-PrintStream ps = new PrintStream(baos);
-data.put(Thread.currentThread(), baos);
-streams.put(Thread.currentThread(), ps);
+data.set(baos);
+streams.set(new PrintStream(baos));
 }
 
 
@@ -87,12 +86,12 @@
  */
 public static String unsetThread() {
 ByteArrayOutputStream baos = 
-(ByteArrayOutputStream) data.get(Thread.currentThread());
+(ByteArrayOutputStream) data.get();
 if (baos == null) {
 return null;
 }
-streams.remove(Thread.currentThread());
-data.remove(Thread.currentThread());
+streams.set(null);
+data.set(null);
 return baos.toString();
 }
 
@@ -104,7 +103,7 @@
  * Find PrintStream to which the output must be written to.
  */
 protected PrintStream findStream() {
-PrintStream ps = (PrintStream) streams.get(Thread.currentThread());
+PrintStream ps = (PrintStream) streams.get();
 if (ps == null) {
 ps = wrapped;
 }



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: patch for ManagerServlet (was Re: yet another tomcat goes stable and I still have to make a custom package)

[Filip Hanik - Dev lists]

yep, I'll get this one in

Haroon Rafique wrote:


On Apr 6 at 9:54am, HR=>Haroon Rafique <[EMAIL PROTECTED]> wrote:

HR> On Mar 22 at 3:04pm, FHDL=>Filip Hanik - Dev Lists <[EMAIL PROTECTED]> 
wrote:
HR> 
HR> FH> patch looks good to me, +1,

HR> FH> if no objections arise, then I can submit, we'll wait until end of week.
HR> FH> Filip
HR> FH> 
HR> FH> http://issues.apache.org/bugzilla/attachment.cgi?id=17944
HR> FH> 
HR> 
HR> Any status on committing the above patch attached to bug 36847?
HR> 

I hear talk of cutting a 5.5.17 release later this week. I would love to 
see the above patch integrated into 5.5.17.


Thanks in Advance,
--
Haroon Rafique
<[EMAIL PROTECTED]>


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


 




-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393613 - /tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java

[fhanik]

Author: fhanik
Date: Wed Apr 12 14:08:01 2006
New Revision: 393613

URL: http://svn.apache.org/viewcvs?rev=393613&view=rev
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=36847
Fixes a bug where a WAR file gets overwritten by itself, and results in a 0 
byte file
when using the tag parameter in ant deploy

Modified:

tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java

Modified: 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java?rev=393613&r1=393612&r2=393613&view=diff
==
--- 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
 (original)
+++ 
tomcat/container/tc5.5.x/webapps/manager/WEB-INF/classes/org/apache/catalina/manager/ManagerServlet.java
 Wed Apr 12 14:08:01 2006
@@ -1502,7 +1502,16 @@
  * @param dest File object representing the destination
  */
 public static boolean copy(File src, File dest) {
-return copyInternal(src, dest, new byte[4096]);
+boolean result = false;
+try {
+if( src != null &&
+!src.getCanonicalPath().equals(dest.getCanonicalPath()) ) {
+result = copyInternal(src, dest, new byte[4096]);
+}
+} catch (IOException e) {
+e.printStackTrace();
+}
+return result;
 }
 
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 36847] - [Patch] ZipException when using "tag" in deploy ant task

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=36847


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-04-12 22:31 ---
Fixed and patched, will be available in 5.5.17
The copy method makes a check make sure it doesn't overwrite file A with file B,
if file A==file B


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 33368] - swallowOutput causes memory leak

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=33368





--- Additional Comments From [EMAIL PROTECTED]  2006-04-12 22:34 ---
patch applied to 5.0

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 39290] New: - mod_jk 1.2.15 and out.write() strange behaviour

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39290

   Summary: mod_jk 1.2.15 and out.write() strange behaviour
   Product: Tomcat 5
   Version: 5.5.16
  Platform: PC
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connector:AJP
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


Suppose the following loop that to writes to a webpage indefinitely:

...
try {
while (true)
{
out.println("... AAA ...");
out.flush();

try
{
Thread.sleep(1000L);
} catch (InterruptedException e) {  }
}

out.close();
}
catch (Exception e) { e.printStackTrace() }


The expected behaviour is that once you click the browser stop button the loop 
break and the stack trace is printed.

It works on these configuration:
- accessing the page directly through the http11 connector
- mod_jk version 1.2.10

It doesn´t work (it loops indefinitely and the exception is never raised)
- mod_jk version 1.2.14
- mod_jk version 1.2.15

So I guess something got broken on the latest versions.

Thanks.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393626 - /tomcat/container/tc5.5.x/webapps/docs/changelog.xml

[fhanik]

Author: fhanik
Date: Wed Apr 12 14:51:37 2006
New Revision: 393626

URL: http://svn.apache.org/viewcvs?rev=393626&view=rev
Log:
Updated on fixed bugs

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393626&r1=393625&r2=393626&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Apr 12 14:51:37 2006
@@ -102,6 +102,12 @@
   
 
   
+36847: Fixed the manager app copy function to not overwrite 
fileA with fileB when fileA==fileB.
+Fix provided by Haroon Rafique (fhanik)
+  
+
+
+  
 38508: Several enhancements to Host Manager application, 
including configurable
   manager app support and dialog box enhancements.  Thanks to George 
Sexton for the patch. (yoavs)
   



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 35064] - Admin WebApp fails to open connectors when clicked.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35064





--- Additional Comments From [EMAIL PROTECTED]  2006-04-13 00:09 ---
Created an attachment (id=18088)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18088&action=view)
Correct patch for casting


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393653 - /tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java

[fhanik]

Author: fhanik
Date: Wed Apr 12 16:16:56 2006
New Revision: 393653

URL: http://svn.apache.org/viewcvs?rev=393653&view=rev
Log:
Fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=35064
Fix submitted by [EMAIL PROTECTED]

Modified:

tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java

Modified: 
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java?rev=393653&r1=393652&r2=393653&view=diff
==
--- 
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
 (original)
+++ 
tomcat/container/tc5.5.x/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/connector/EditConnectorAction.java
 Wed Apr 12 16:16:56 2006
@@ -41,7 +41,7 @@
 import org.apache.webapp.admin.LabelValueBean;
 import org.apache.webapp.admin.Lists;
 import org.apache.webapp.admin.TomcatTreeBuilder;
-
+import java.net.InetAddress;
 /**
  * The Action that sets up Edit Connector transactions.
  *
@@ -170,9 +170,15 @@
 connectorFm.setEnableLookups
 (String.valueOf(mBServer.getAttribute(cname, attribute))); 
   
 attribute = "address";
-connectorFm.setAddress
-((String) mBServer.getAttribute(cname, attribute));  
-attribute = "maxKeepAliveRequests";
+Object addressObject = mBServer.getAttribute(cname, attribute);
+   String addressStr = "";
+   if (addressObject instanceof InetAddress){
+   addressStr = ((InetAddress)addressObject).getHostAddress();
+   } else if (addressObject instanceof String) {
+   addressStr = (String) addressObject;
+   }
+   connectorFm.setAddress(addressStr);
+   attribute = "maxKeepAliveRequests";
 connectorFm.setMaxKeepAliveText
 (String.valueOf(mBServer.getAttribute(cname, attribute))); 
  
 attribute = "maxSpareThreads";



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 35064] - Admin WebApp fails to open connectors when clicked.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35064


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-04-13 00:17 ---
Fix added, depending on what component is used, its either a InetAddress or a
String, this fix has the correct cast checking.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 39292] New: - "balancer" webapp broken when run catalina.bat start -security

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39292

   Summary: "balancer" webapp broken when run catalina.bat start -
security
   Product: Tomcat 5
   Version: 5.5.16
  Platform: Other
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


The catalina.policy shipped with 5.5.16 contains an obsolete reference to
"/webapps/balancer/WEB-INF/classes/". This webapp now ships in a jar file, not
the classes directory, so this:

// The permissions granted to the balancer WEB-INF/classes directory
grant codeBase "file:${catalina.home}/webapps/balancer/WEB-INF/classes/-" {
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.util.digester";
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.util.digester.*";
};


... needs to change to this ...

grant codeBase
"file:${catalina.home}/webapps/balancer/WEB-INF/lib/catalina-balancer.jar" {
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.util.digester";
permission java.lang.RuntimePermission
"accessClassInPackage.org.apache.tomcat.util.digester.*";
}

Cheers,
Kerry

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 39292] - "balancer" webapp broken when run catalina.bat start -security

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39292





--- Additional Comments From [EMAIL PROTECTED]  2006-04-13 03:53 ---
Created an attachment (id=18089)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18089&action=view)
diff -u for catalina.polocy


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393732 - in /tomcat/container/tc5.5.x: catalina/src/conf/catalina.policy webapps/docs/changelog.xml

[pero]

Author: pero
Date: Wed Apr 12 23:32:25 2006
New Revision: 393732

URL: http://svn.apache.org/viewcvs?rev=393732&view=rev
Log:
Fix that balancer app bundle with .jar and can start with SecurityManager 
support.

Modified:
tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy?rev=393732&r1=393731&r2=393732&view=diff
==
--- tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy (original)
+++ tomcat/container/tc5.5.x/catalina/src/conf/catalina.policy Wed Apr 12 
23:32:25 2006
@@ -83,8 +83,8 @@
 permission java.security.AllPermission;
 };
 
-// The permissions granted to the balancer WEB-INF/classes directory
-grant codeBase "file:${catalina.home}/webapps/balancer/WEB-INF/classes/-" {
+// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib 
directory
+grant codeBase "file:${catalina.home}/webapps/balancer/-" {
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.tomcat.util.digester";
 permission java.lang.RuntimePermission 
"accessClassInPackage.org.apache.tomcat.util.digester.*";
 };

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=393732&r1=393731&r2=393732&view=diff
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Apr 12 23:32:25 2006
@@ -102,11 +102,12 @@
   
 
   
+39292: Update catalina.policy at demo balancer app. Fix 
provided by Kerry Sainsbury (pero)
+  
+  
 36847: Fixed the manager app copy function to not overwrite 
fileA with fileB when fileA==fileB.
 Fix provided by Haroon Rafique (fhanik)
   
-
-
   
 38508: Several enhancements to Host Manager application, 
including configurable
   manager app support and dialog box enhancements.  Thanks to George 
Sexton for the patch. (yoavs)



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 39292] - "balancer" webapp broken when run catalina.bat start -security

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39292


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-04-13 07:33 ---

I thing better is to open both with  classes and lib
grant codeBase "file:${catalina.home}/webapps/balancer/WEB-INF/classes/-"

Thanks included for 5.5.17
Peter

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r393735 - in /tomcat/connectors/trunk/jni/native/src: os.c ssl.c

[mturk]

Author: mturk
Date: Wed Apr 12 23:41:49 2006
New Revision: 393735

URL: http://svn.apache.org/viewcvs?rev=393735&view=rev
Log:
Use proper castings for thread_current.

Modified:
tomcat/connectors/trunk/jni/native/src/os.c
tomcat/connectors/trunk/jni/native/src/ssl.c

Modified: tomcat/connectors/trunk/jni/native/src/os.c
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/os.c?rev=393735&r1=393734&r2=393735&view=diff
==
--- tomcat/connectors/trunk/jni/native/src/os.c (original)
+++ tomcat/connectors/trunk/jni/native/src/os.c Wed Apr 12 23:41:49 2006
@@ -18,7 +18,7 @@
  * @author Mladen Turk
  * @version $Revision$, $Date$
  */
- 
+
 #include "apr.h"
 #include "apr_pools.h"
 #include "apr_portable.h"
@@ -46,5 +46,5 @@
 TCN_IMPLEMENT_CALL(jlong, OS, threadCurrent)(TCN_STDARGS)
 {
 UNREFERENCED_STDARGS;
-return (jlong)apr_os_thread_current();
+return (jlong)((unsigned long)apr_os_thread_current());
 }

Modified: tomcat/connectors/trunk/jni/native/src/ssl.c
URL: 
http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/ssl.c?rev=393735&r1=393734&r2=393735&view=diff
==
--- tomcat/connectors/trunk/jni/native/src/ssl.c (original)
+++ tomcat/connectors/trunk/jni/native/src/ssl.c Wed Apr 12 23:41:49 2006
@@ -200,7 +200,7 @@
 
 return psaptr->PSATOLD;
 #else
-return (unsigned long)((jlong)apr_os_thread_current());
+return (unsigned long)(apr_os_thread_current());
 #endif
 }
 
@@ -371,7 +371,7 @@
 }
 if (SSLeay() < 0x0090700L) {
 TCN_FREE_CSTRING(engine);
-return (jint)APR_EINVAL;
+return (jint)APR_EINVAL;
 }
 /* We must register the library in full, to ensure our configuration
  * code can successfully test the SSL environment.



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]