svn commit: r1447145 - /tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java

2013-02-18 Thread kfujino 
Author: kfujino
Date: Mon Feb 18 08:15:02 2013
New Revision: 1447145

URL: http://svn.apache.org/r1447145
Log:
Avoid duplicated store of ClusterDeployer.
FarmWarDeployer extends ClusterListener and implements ClusterDeployer.

Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java

Modified: 
tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java?rev=1447145&r1=1447144&r2=1447145&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java 
Mon Feb 18 08:15:02 2013
@@ -18,6 +18,8 @@
 package org.apache.catalina.storeconfig;
 
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Valve;
@@ -25,6 +27,7 @@ import org.apache.catalina.ha.CatalinaCl
 import org.apache.catalina.ha.ClusterDeployer;
 import org.apache.catalina.ha.ClusterListener;
 import org.apache.catalina.ha.ClusterManager;
+import org.apache.catalina.ha.deploy.FarmWarDeployer;
 import org.apache.catalina.ha.tcp.SimpleTcpCluster;
 import org.apache.catalina.tribes.Channel;
 
@@ -81,7 +84,13 @@ public class CatalinaClusterSF extends S
 storeElementArray(aWriter, indent, listeners);
 // Store nested  elements
 ClusterListener mlisteners[] = 
((SimpleTcpCluster)cluster).findClusterListeners();
-storeElementArray(aWriter, indent, mlisteners);
+List clusterListeners = new ArrayList<>();
+for (ClusterListener clusterListener : mlisteners) {
+if (!(clusterListener instanceof FarmWarDeployer)) {
+clusterListeners.add(clusterListener);
+}
+}
+storeElementArray(aWriter, indent, clusterListeners.toArray());
 }
 }
 }



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

Re: svn commit: r1447145 - /tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java

2013-02-18 Thread Konstantin Kolinko 
2013/2/18  :
> Author: kfujino
> Date: Mon Feb 18 08:15:02 2013
> New Revision: 1447145
>
> URL: http://svn.apache.org/r1447145
> Log:
> Avoid duplicated store of ClusterDeployer.
> FarmWarDeployer extends ClusterListener and implements ClusterDeployer.
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
>
> Modified: 
> tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java
> URL: 
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java?rev=1447145&r1=1447144&r2=1447145&view=diff
> ==
> --- tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java 
> (original)
> +++ tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java 
> Mon Feb 18 08:15:02 2013
> @@ -18,6 +18,8 @@
>  package org.apache.catalina.storeconfig;
>
>  import java.io.PrintWriter;
> +import java.util.ArrayList;
> +import java.util.List;
>
>  import org.apache.catalina.LifecycleListener;
>  import org.apache.catalina.Valve;
> @@ -25,6 +27,7 @@ import org.apache.catalina.ha.CatalinaCl
>  import org.apache.catalina.ha.ClusterDeployer;
>  import org.apache.catalina.ha.ClusterListener;
>  import org.apache.catalina.ha.ClusterManager;
> +import org.apache.catalina.ha.deploy.FarmWarDeployer;
>  import org.apache.catalina.ha.tcp.SimpleTcpCluster;
>  import org.apache.catalina.tribes.Channel;
>
> @@ -81,7 +84,13 @@ public class CatalinaClusterSF extends S
>  storeElementArray(aWriter, indent, listeners);
>  // Store nested  elements
>  ClusterListener mlisteners[] = 
> ((SimpleTcpCluster)cluster).findClusterListeners();
> -storeElementArray(aWriter, indent, mlisteners);
> +List clusterListeners = new ArrayList<>();
> +for (ClusterListener clusterListener : mlisteners) {
> +if (!(clusterListener instanceof FarmWarDeployer)) {

Maybe be more generic, like
"if (clusterListener != deployer)" ?

> +clusterListeners.add(clusterListener);
> +}
> +}
> +storeElementArray(aWriter, indent, 
> clusterListeners.toArray());
>  }
>  }
>  }
>

Best regards,
Konstantin Kolinko

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

svn commit: r1447171 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket: AprSocket.java AprSocketContext.java

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 09:36:08 2013
New Revision: 1447171

URL: http://svn.apache.org/r1447171
Log:
Fix checkstyle warnings
(sorry new laptop - need to configure it properly)

Modified:
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java?rev=1447171&r1=1447170&r2=1447171&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocket.java Mon Feb 18 
09:36:08 2013
@@ -61,28 +61,28 @@ public class AprSocket implements Runnab
 
 private static final byte[][] NO_CERTS = new byte[0][];
 
-final static int CONNECTING = 0x1;
-final static int CONNECTED = 0x2;
+static final int CONNECTING = 0x1;
+static final int CONNECTED = 0x2;
 
 // Current ( real ) poll status
-final static int POLLIN_ACTIVE = 0x4;
-final static int POLLOUT_ACTIVE = 0x8;
+static final int POLLIN_ACTIVE = 0x4;
+static final int POLLOUT_ACTIVE = 0x8;
 
-final static int POLL = 0x10;
+static final int POLL = 0x10;
 
-final static int SSL_ATTACHED = 0x40;
+static final int SSL_ATTACHED = 0x40;
 
 // Requested poll status. Set by read/write when needed.
 // Cleared when polled
-final static int POLLIN = 0x80;
-final static int POLLOUT = 0x100;
+static final int POLLIN = 0x80;
+static final int POLLOUT = 0x100;
 
-final static int ACCEPTED = 0x200;
-final static int ERROR = 0x400;
-final static int CLOSED = 0x800;
+static final int ACCEPTED = 0x200;
+static final int ERROR = 0x400;
+static final int CLOSED = 0x800;
 
-final static int READING = 0x1000;
-final static int WRITING = 0x2000;
+static final int READING = 0x1000;
+static final int WRITING = 0x2000;
 
 // Not null
 private final AprSocketContext context;

Modified: tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java?rev=1447171&r1=1447170&r2=1447171&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/jni/socket/AprSocketContext.java Mon 
Feb 18 09:36:08 2013
@@ -91,7 +91,7 @@ public class AprSocketContext {
 
 private final AprSocket END = new AprSocket(this);
 
-private final static AtomicInteger contextNumber = new AtomicInteger();
+private static final AtomicInteger contextNumber = new AtomicInteger();
 private int contextId;
 
 private final AtomicInteger threadNumber = new AtomicInteger();
@@ -123,7 +123,7 @@ public class AprSocketContext {
 private boolean nonBlockingAccept = false;
 
 private final BlockingQueue acceptedQueue =
-   new LinkedBlockingQueue<>();
+new LinkedBlockingQueue<>();
 
 /**
  * Root APR memory pool.
@@ -744,7 +744,7 @@ public class AprSocketContext {
 
 int family = Socket.APR_INET;
 inetAddress =
-   Address.info(null, family, port, 0, 
serverSockPool);
+Address.info(null, family, port, 0, serverSockPool);
 
 // Create the APR server socket
 serverSock = Socket.create(family,



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

Re: svn commit: r1447074 - in /tomcat/trunk/java/org/apache/tomcat/jni/socket: AprSocket.java AprSocketContext.java

2013-02-18 Thread Mark Thomas 
On 17/02/2013 21:48, Konstantin Kolinko wrote:
> Adding "finals" to apparent constant fields is OK (e.g. those
> CONNECTING, CONNECTED fields), but generic reducing visibilities here
> and there seems wrong.

o.a.tomcat.jni.socket is the package added for spdy support. The code is
still a work in progress. For example:
- keepAliveTimeout (currently unused)
- Look at the TODOs
- hard-coded flags such as USE_TICKETS, nonBlockingAccept, debugPoll

I have no problem reducing visibility as I did. UCDetector raises many
more issues than I fixed. I left those because I judged that as the code
was completed those issues would be resolved.

> I think we either have to revert most of this commit and resort to the
> usual routine of @deprecating and leave current visibilities as is,
> or change external in tc-native to point to 7.0.x code instead of
> trunk.

I disagree with both suggestions.

> That is just based on our policies. I personally do not use this
> AprSocket class.

Our policy varies depending on the stability of the code in question.
This code is a work in progress (much like the WebSocket code) so we can
change pretty much whatever we like.

> Other possible worry is that I think that UCDetector cannot detect
> when something is used from the native side. I wonder whether it
> proposed to delete the private constructor of o.a.t.jni.Error class,
> which is not used from Java but is used from native/src/error.c.
> (It is not a concern for these AprSocket, AprSocketContext classes as
> they appear to be never mentioned in the native code).

That should be the least of your worries. UCDetector doesn't spot use by
the digester (hence suggests most getters and setters can be removed)
nor does it spot use in generated code by Jasper (hence suggests large
chunks of Jasper code can be removed).

Because of the rather non-standard things we do in Tomcat, UCDetector
isn't a tool that can be followed blindly. It needs to be used by
someone with a reasonable understanding of the code and the suggestions
(particularly those to remove code) need to be checked carefully before
following them.

Mark


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

svn commit: r1447173 - in /tomcat/trunk/java/org/apache: catalina/valves/rewrite/ jasper/runtime/ jasper/tagplugins/jstl/ jasper/xmlparser/ tomcat/websocket/

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 09:50:46 2013
New Revision: 1447173

URL: http://svn.apache.org/r1447173
Log:
Fix checkstyle warnings (sorry new laptop)

Modified:
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java

Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java Mon 
Feb 18 09:50:46 2013
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
 
 public class RewriteCond {
 
-public static abstract class Condition {
+public abstract static class Condition {
 public abstract boolean evaluate(String value, Resolver resolver);
 }
 

Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspWriterImpl.java Mon Feb 18 
09:50:46 2013
@@ -331,7 +331,7 @@ public class JspWriterImpl extends JspWr
 
 
 private static final String lineSeparator =
-   System.getProperty("line.separator");
+System.getProperty("line.separator");
 
 /**
  * Write a line separator.  The line separator string is defined by the

Modified: tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java (original)
+++ tomcat/trunk/java/org/apache/jasper/tagplugins/jstl/Util.java Mon Feb 18 
09:50:46 2013
@@ -52,7 +52,7 @@ public class Util {
 private static final int HIGHEST_SPECIAL = '>';
 
 private static final char[][] specialCharactersRepresentation =
-   new char[HIGHEST_SPECIAL + 1][];
+new char[HIGHEST_SPECIAL + 1][];
 
 static {
 specialCharactersRepresentation['&'] = "&".toCharArray();
@@ -273,14 +273,14 @@ public class Util {
 
 @Override
 public boolean isReady() {
-   // Non-blocking IO not supported
+// Non-blocking IO not supported
 return false;
 }
 
 @Override
 public void setWriteListener(WriteListener listener) {
-   // Non-blocking IO not supported
-   throw new UnsupportedOperationException();
+// Non-blocking IO not supported
+throw new UnsupportedOperationException();
 }
 
 

Modified: tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/xmlparser/XMLEncodingDetector.java Mon 
Feb 18 09:50:46 2013
@@ -960,7 +960,7 @@ public class XMLEncodingDetector {
 
 // read characters
 int count = fCurrentEntity.reader.read(fCurrentEntity.ch, offset,
-   DEFAULT_XMLDECL_BUFFER_SIZE);
+DEFAULT_XMLDECL_BUFFER_SIZE);
 
 // reset count and position
 boolean entityChanged = false;

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java?rev=1447173&r1=1447172&r2=1447173&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Mon 
Feb 18 09:50:46 2013
@@ -667,7 +667,7 @@ public abstract class WsRemoteEndpointBa
 
 @Override
 public SendResult get() throws InterruptedException,
-

svn commit: r1447174 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsSession.java WsWebSocketContainer.java

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 09:52:09 2013
New Revision: 1447174

URL: http://svn.apache.org/r1447174
Log:
Consistent naming

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java?rev=1447174&r1=1447173&r2=1447174&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Mon Feb 18 
09:52:09 2013
@@ -255,7 +255,7 @@ public class WsSession implements Sessio
 
 @Override
 public Set getOpenSessions() {
-return webSocketContainer.getOpenSession(localEndpoint.getClass());
+return webSocketContainer.getOpenSessions(localEndpoint.getClass());
 }
 
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1447174&r1=1447173&r2=1447174&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon 
Feb 18 09:52:09 2013
@@ -219,7 +219,7 @@ public class WsWebSocketContainer
 }
 
 
-Set getOpenSession(Class endpoint) {
+Set getOpenSessions(Class endpoint) {
 HashSet result = new HashSet<>();
 Set sessions = endpointSessionMap.get(endpoint);
 if (sessions != null) {



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

svn commit: r1447175 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 09:55:16 2013
New Revision: 1447175

URL: http://svn.apache.org/r1447175
Log:
Need to lock on read too

Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java

Modified: 
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1447175&r1=1447174&r2=1447175&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Mon 
Feb 18 09:55:16 2013
@@ -221,9 +221,11 @@ public class WsWebSocketContainer
 
 Set getOpenSessions(Class endpoint) {
 HashSet result = new HashSet<>();
-Set sessions = endpointSessionMap.get(endpoint);
-if (sessions != null) {
-result.addAll(sessions);
+synchronized (endPointSessionMapLock) {
+Set sessions = endpointSessionMap.get(endpoint);
+if (sessions != null) {
+result.addAll(sessions);
+}
 }
 return result;
 }



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

Re: svn commit: r1445893 - in /tomcat/trunk: java/javax/websocket/ java/org/apache/tomcat/websocket/ java/org/apache/tomcat/websocket/server/ test/org/apache/tomcat/websocket/

2013-02-18 Thread Mark Thomas 
On 18/02/2013 00:02, Konstantin Kolinko wrote:
> 2013/2/14  :

>>  @Override
>>  public Set getOpenSessions() {
>> -// TODO Auto-generated method stub
>> -return null;
>> +return webSocketContainer.getOpenSession(localEndpoint.getClass());
> 
> Inconsistent method names. s/getOpenSession/getOpenSessions/

Fixed.

>> +Set getOpenSession(Class endpoint) {
>> +HashSet result = new HashSet<>();
>> +result.addAll(endpointSessionMap.get(endpoint));
>> +return result;
> 
> endpointSessionMap is a mere HashMap.
> I think a lock is needed here, or a ConcurrentHashMap.

Fixed.

Thanks,

Mark


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

svn commit: r1447178 - /tomcat/trunk/java/javax/servlet/http/Part.java

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 10:06:16 2013
New Revision: 1447178

URL: http://svn.apache.org/r1447178
Log:
Improve Javadoc. Clarify difference between spec minimum behaviour and what 
Tomcat does.

Modified:
tomcat/trunk/java/javax/servlet/http/Part.java

Modified: tomcat/trunk/java/javax/servlet/http/Part.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/Part.java?rev=1447178&r1=1447177&r2=1447178&view=diff
==
--- tomcat/trunk/java/javax/servlet/http/Part.java (original)
+++ tomcat/trunk/java/javax/servlet/http/Part.java Mon Feb 18 10:06:16 2013
@@ -71,10 +71,14 @@ public interface Part {
 
 /**
  * Deletes the underlying storage for a part, including deleting any
- * associated temporary disk file. Although this storage will be deleted
- * automatically when the Part instance is garbage collected, this
- * method can be used to ensure that this is done at an earlier time, thus
- * preserving system resources.
+ * associated temporary disk file. Although the container will delete this
+ * storage automatically this method can be used to ensure that this is 
done
+ * at an earlier time, thus preserving system resources.
+ * 
+ * Containers are only required to delete the associated storage when the
+ * Part instance is garbage collected. Apache Tomcat will delete the
+ * associated storage when the associated request has finished processing.
+ * Behaviour of other containers may be different.
  */
 public void delete() throws IOException;
 



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

svn commit: r1447181 - in /tomcat/tc7.0.x/trunk: ./ java/javax/servlet/http/Part.java

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 10:13:25 2013
New Revision: 1447181

URL: http://svn.apache.org/r1447181
Log:
Improve Javadoc. Clarify difference between spec minimum behaviour and what 
Tomcat does.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/javax/servlet/http/Part.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1447178

Modified: tomcat/tc7.0.x/trunk/java/javax/servlet/http/Part.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/servlet/http/Part.java?rev=1447181&r1=1447180&r2=1447181&view=diff
==
--- tomcat/tc7.0.x/trunk/java/javax/servlet/http/Part.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/servlet/http/Part.java Mon Feb 18 10:13:25 
2013
@@ -71,10 +71,14 @@ public interface Part {
 
 /**
  * Deletes the underlying storage for a part, including deleting any
- * associated temporary disk file. Although this storage will be deleted
- * automatically when the Part instance is garbage collected, this
- * method can be used to ensure that this is done at an earlier time, thus
- * preserving system resources.
+ * associated temporary disk file. Although the container will delete this
+ * storage automatically this method can be used to ensure that this is 
done
+ * at an earlier time, thus preserving system resources.
+ * 
+ * Containers are only required to delete the associated storage when the
+ * Part instance is garbage collected. Apache Tomcat will delete the
+ * associated storage when the associated request has finished processing.
+ * Behaviour of other containers may be different.
  */
 public void delete() throws IOException;
 



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

[VOTE][RESULT] Release Apache Tomcat 7.0.37

2013-02-18 Thread Mark Thomas 
Stable
Binding: jfarcand, rjung, yoavs, mturk, kfujino, kkolinko, olamy,
 markt
Non-binding: Arne Franken, violetagg

No other votes were cast. This vote therefore passes.

I'll start moving the bits to the release locations. I'll update the
site once the mirrors have had a chance to catch up.

Mark

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

svn commit: r1424 - /release/tomcat/tomcat-7/v7.0.34/

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 10:48:28 2013
New Revision: 1424

Log:
Remove old release

Removed:
release/tomcat/tomcat-7/v7.0.34/


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

svn commit: r1424 - /release/tomcat/tomcat-7/v7.0.34/

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 10:48:28 2013
New Revision: 1424

Log:
Remove old release

Removed:
release/tomcat/tomcat-7/v7.0.34/


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

svn commit: r1425 - /dev/tomcat/tomcat-7/v7.0.37/ /release/tomcat/tomcat-7/v7.0.37/

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 10:50:08 2013
New Revision: 1425

Log:
Release v7.0.37

Added:
release/tomcat/tomcat-7/v7.0.37/
  - copied from r1424, dev/tomcat/tomcat-7/v7.0.37/
Removed:
dev/tomcat/tomcat-7/v7.0.37/


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

svn commit: r1425 - /dev/tomcat/tomcat-7/v7.0.37/ /release/tomcat/tomcat-7/v7.0.37/

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 10:50:08 2013
New Revision: 1425

Log:
Release v7.0.37

Added:
release/tomcat/tomcat-7/v7.0.37/
  - copied from r1424, dev/tomcat/tomcat-7/v7.0.37/
Removed:
dev/tomcat/tomcat-7/v7.0.37/


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

svn commit: r1447188 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 11:06:03 2013
New Revision: 1447188

URL: http://svn.apache.org/r1447188
Log:
Fix typo

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1447188&r1=1447187&r2=1447188&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Feb 18 11:06:03 2013
@@ -95,7 +95,7 @@
   
   
 54536: Ensure the default error page is displayed if a 
custom
-HHTP status code is used when calling
+HTTP status code is used when calling
 HttpServletResponse#sendError(int, String). (markt)
   
 



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

svn commit: r1447191 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 11:08:24 2013
New Revision: 1447191

URL: http://svn.apache.org/r1447191
Log:
Another typo

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1447191&r1=1447190&r2=1447191&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Feb 18 11:08:24 2013
@@ -185,7 +185,7 @@
 stopping unless the error is fatal to the JVM. (markt)
   
   
-54507: Do not start the background thread that is used to
+54507: Do not start the background thread that is used for
 expiring sessions (amongst other things) until the web application is
 fully started. Stop the background thread as soon as the web 
application
 is stopped. (markt)



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

[Bug 54527] Synchronize conf/web.xml mime mapping with Tomcat 7

2013-02-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=54527

--- Comment #4 from Mark Thomas  ---
The proposed patch creates duplicate definitions for:
htke, odft, oti, svc, svd, text, tfi, tfm, tga, thmx, s, s3m, saf, sbml, sc,
scd, scm, scq, scs, scurl, sda, sdc, sdd, sdkd, sdkm, sdp, sdw, see, seed,
sema, semd, semf, ser, setpay, setreg, sfd-hdstx, sfs, sfx, sgi, sgl, sgm, sgml

I'll have an updated proposal shortly.

-- 
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

[Bug 54527] Synchronize conf/web.xml mime mapping with Tomcat 7

2013-02-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=54527

Mark Thomas  changed:

   What|Removed |Added

  Attachment #29952|0   |1
is obsolete||

--- Comment #5 from Mark Thomas  ---
Created attachment 29962
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29962&action=edit
Proposed patch

New patch that doesn't create the duplicates.

-- 
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: r1447254 - /tomcat/tc6.0.x/trunk/STATUS.txt

2013-02-18 Thread markt 
Author: markt
Date: Mon Feb 18 13:42:50 2013
New Revision: 1447254

URL: http://svn.apache.org/r1447254
Log:
Proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1447254&r1=1447253&r2=1447254&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Feb 18 13:42:50 2013
@@ -99,6 +99,13 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, markt
   -1:
 
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54527
+  Update file extension to MIME type mapping in web.xml. Aligh with current
+  trunk.
+  https://issues.apache.org/bugzilla/attachment.cgi?id=29962
+  +1: markt
+  -1:
+
 
 PATCHES/ISSUES THAT ARE STALLED
 



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

[Bug 54527] Synchronize conf/web.xml mime mapping with Tomcat 7

2013-02-18 Thread bugzilla 
https://issues.apache.org/bugzilla/show_bug.cgi?id=54527

--- Comment #6 from Mark Thomas  ---
Updated patch proposed for 6.0.x.

-- 
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

[Tomcat Wiki] Trivial Update of "JerrodPim" by JerrodPim

2013-02-18 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "JerrodPim" page has been changed by JerrodPim:
http://wiki.apache.org/tomcat/JerrodPim

New page:
Nothing to say about myself really.<>
Yes! Im a part of this community.<>
I just wish I am useful at all<>
<>
Here is my web-site: [[http://www.chocolatehouse.pl/|fotograf warszawa]]

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

[Tomcat Wiki] Update of "LocalBadContent" by ChuckCaldarale

2013-02-18 Thread Apache Wiki 
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The "LocalBadContent" page has been changed by ChuckCaldarale:
http://wiki.apache.org/tomcat/LocalBadContent?action=diff&rev1=73&rev2=74

  celular-mobile\.com
  chatsky\.cn
  cheapestoemsoftware
+ chocolatehouse\.pl
  computerrental\.biz
  copdregionalnetwork\.org
  directorysubmitlist\.com

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

svn commit: r1447296 - /tomcat/maven-plugin/trunk/pom.xml

2013-02-18 Thread olamy 
Author: olamy
Date: Mon Feb 18 15:08:35 2013
New Revision: 1447296

URL: http://svn.apache.org/r1447296
Log:
use 7.0.37

Modified:
tomcat/maven-plugin/trunk/pom.xml

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1447296&r1=1447295&r2=1447296&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Feb 18 15:08:35 2013
@@ -72,7 +72,7 @@
 2001
 
 2008
-7.0.35
+7.0.37
 
 
 



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

[jira] [Updated] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo

2013-02-18 Thread Tim Astle (JIRA) 

 [ 
https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tim Astle updated MTOMCAT-208:
--

Attachment: StandaloneWarMojo.java.patch

> JaCoCo instrumentation errors when running StandaloneWarMojo
> 
>
> Key: MTOMCAT-208
> URL: https://issues.apache.org/jira/browse/MTOMCAT-208
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Improvement
>  Components: tomcat7
>Affects Versions: 2.1
>Reporter: Tim Astle
>Assignee: Olivier Lamy (*$^¨%`£)
> Attachments: StandaloneWarMojo.java.patch
>
>
> We've run into issues with using the plugin with jacoco for code coverage 
> getting instrumentation errors on classes (saying they've already been 
> instrumented).  We found that this was due to how the exec-war and 
> standalone-war goals work because they fork and start a new package phase (at 
> least from what I've read that's what they're doing), so it's getting 
> executed twice and the second time when it tries to instrument the classes it 
> gets the errors.  I found this doesn't occur with the exec-war-only goal, so 
> I updated the StandaloneWarMojo class to not have the @Execute(phase = 
> LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the 
> issue.  Not sure if it would make more sense to add another goal such as 
> 'standalone-war-only' and keep the existing standalone-war or not.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Created] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo

2013-02-18 Thread Tim Astle (JIRA) 
Tim Astle created MTOMCAT-208:
-

 Summary: JaCoCo instrumentation errors when running 
StandaloneWarMojo
 Key: MTOMCAT-208
 URL: https://issues.apache.org/jira/browse/MTOMCAT-208
 Project: Apache Tomcat Maven Plugin
  Issue Type: Improvement
  Components: tomcat7
Affects Versions: 2.1
Reporter: Tim Astle
Assignee: Olivier Lamy (*$^¨%`£)
 Attachments: StandaloneWarMojo.java.patch

We've run into issues with using the plugin with jacoco for code coverage 
getting instrumentation errors on classes (saying they've already been 
instrumented).  We found that this was due to how the exec-war and 
standalone-war goals work because they fork and start a new package phase (at 
least from what I've read that's what they're doing), so it's getting executed 
twice and the second time when it tries to instrument the classes it gets the 
errors.  I found this doesn't occur with the exec-war-only goal, so I updated 
the StandaloneWarMojo class to not have the @Execute(phase = 
LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the 
issue.  Not sure if it would make more sense to add another goal such as 
'standalone-war-only' and keep the existing standalone-war or not.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

[jira] [Commented] (MTOMCAT-208) JaCoCo instrumentation errors when running StandaloneWarMojo

2013-02-18 Thread Tim Astle (JIRA) 

[ 
https://issues.apache.org/jira/browse/MTOMCAT-208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13580736#comment-13580736
 ] 

Tim Astle commented on MTOMCAT-208:
---

If anyone has any suggestions on the best way to approach this, let me know.  
We're willing to put some time into fixing this.  Ideally we'd like to get this 
into the 2.1 release.

> JaCoCo instrumentation errors when running StandaloneWarMojo
> 
>
> Key: MTOMCAT-208
> URL: https://issues.apache.org/jira/browse/MTOMCAT-208
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Improvement
>  Components: tomcat7
>Affects Versions: 2.1
>Reporter: Tim Astle
>Assignee: Olivier Lamy (*$^¨%`£)
> Attachments: StandaloneWarMojo.java.patch
>
>
> We've run into issues with using the plugin with jacoco for code coverage 
> getting instrumentation errors on classes (saying they've already been 
> instrumented).  We found that this was due to how the exec-war and 
> standalone-war goals work because they fork and start a new package phase (at 
> least from what I've read that's what they're doing), so it's getting 
> executed twice and the second time when it tries to instrument the classes it 
> gets the errors.  I found this doesn't occur with the exec-war-only goal, so 
> I updated the StandaloneWarMojo class to not have the @Execute(phase = 
> LifeCyclePhase.PACKAGE) annotation on it and that appeared to resolve the 
> issue.  Not sure if it would make more sense to add another goal such as 
> 'standalone-war-only' and keep the existing standalone-war or not.

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

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

svn commit: r1447458 [50/50] - in /tomcat/site/trunk/docs/tomcat-7.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authent

2013-02-18 Thread markt 
Modified: tomcat/site/trunk/docs/tomcat-7.0-doc/windows-auth-howto.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-7.0-doc/windows-auth-howto.html?rev=1447458&r1=1447457&r2=1447458&view=diff
==
--- tomcat/site/trunk/docs/tomcat-7.0-doc/windows-auth-howto.html (original)
+++ tomcat/site/trunk/docs/tomcat-7.0-doc/windows-auth-howto.html Mon Feb 18 
20:18:30 2013
@@ -1,4 +1,4 @@
-Apache Tomcat 7 (7.0.35) - Windows Authentication 
How-To
+Apache Tomcat 7 (7.0.37) - Windows Authentication 
How-To