Re: [VOTE] Apache Tomcat Maven Plugin 2.1
On 02/20/2013 10:51 PM, Olivier Lamy wrote: Hi, I'd like to release Apache Tomcat Maven Plugin 2.1. +1 Did just some basic tests. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1449644 - in /tomcat/site/trunk: docs/maven-plugin.html xdocs/maven-plugin.xml
Author: olamy Date: Mon Feb 25 10:16:11 2013 New Revision: 1449644 URL: http://svn.apache.org/r1449644 Log: tomcat maven plugin 2.1 release Modified: tomcat/site/trunk/docs/maven-plugin.html tomcat/site/trunk/xdocs/maven-plugin.xml Modified: tomcat/site/trunk/docs/maven-plugin.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin.html?rev=1449644&r1=1449643&r2=1449644&view=diff == --- tomcat/site/trunk/docs/maven-plugin.html (original) +++ tomcat/site/trunk/docs/maven-plugin.html Mon Feb 25 10:16:11 2013 @@ -206,6 +206,9 @@ Trunk documentation (under development) +Version 2.1 (released version: 2013-02-25) + + Version 2.0 (released version: 2012-09-14) Modified: tomcat/site/trunk/xdocs/maven-plugin.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/maven-plugin.xml?rev=1449644&r1=1449643&r2=1449644&view=diff == --- tomcat/site/trunk/xdocs/maven-plugin.xml (original) +++ tomcat/site/trunk/xdocs/maven-plugin.xml Mon Feb 25 10:16:11 2013 @@ -22,6 +22,7 @@ Trunk documentation (under development) +Version 2.1 (released version: 2013-02-25) Version 2.0 (released version: 2012-09-14) Version 2.0-beta-1 (released version: 2012-02-01) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1484 - /dev/tomcat/maven-plugin/v2.1/ /release/tomcat/maven-plugin/v2.1/
Author: olamy Date: Mon Feb 25 10:17:47 2013 New Revision: 1484 Log: 2.1 release of maven plugin Added: release/tomcat/maven-plugin/v2.1/ - copied from r1483, dev/tomcat/maven-plugin/v2.1/ Removed: dev/tomcat/maven-plugin/v2.1/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1484 - /dev/tomcat/maven-plugin/v2.1/ /release/tomcat/maven-plugin/v2.1/
Author: olamy Date: Mon Feb 25 10:17:47 2013 New Revision: 1484 Log: 2.1 release of maven plugin Added: release/tomcat/maven-plugin/v2.1/ - copied from r1483, dev/tomcat/maven-plugin/v2.1/ Removed: dev/tomcat/maven-plugin/v2.1/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1485 - /release/tomcat/maven-plugin/v2.0/
Author: olamy Date: Mon Feb 25 10:18:30 2013 New Revision: 1485 Log: remove previous release Removed: release/tomcat/maven-plugin/v2.0/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1485 - /release/tomcat/maven-plugin/v2.0/
Author: olamy Date: Mon Feb 25 10:18:30 2013 New Revision: 1485 Log: remove previous release Removed: release/tomcat/maven-plugin/v2.0/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[RESULT] [VOTE] Apache Tomcat Maven Plugin 2.1
Hi, The vote has passed with the following result: +1 (binding): Henri Gomez, Mladen Turk, Olivier Lamy +1 (non binding): Glen Mazza, Tim Astle. I will continue the release process. Thanks ! -- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/3993 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1449652 Blamelist: markt BUILD FAILED: failed compile_1 sincerely, -The Buildbot
svn commit: r1449678 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
Author: markt
Date: Mon Feb 25 12:13:54 2013
New Revision: 1449678
URL: http://svn.apache.org/r1449678
Log:
Fix a couple of TODOs
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.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=1449678&r1=1449677&r2=1449678&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java Mon Feb 25
12:13:54 2013
@@ -54,6 +54,8 @@ public class WsSession implements Sessio
private final Endpoint localEndpoint;
private final WsRemoteEndpointBase wsRemoteEndpoint;
+private final RemoteEndpoint.Async remoteEndpointAsync;
+private final RemoteEndpoint.Basic remoteEndpointBasic;
private final ClassLoader applicationClassLoader;
private final WsWebSocketContainer webSocketContainer;
private final WsRequest request;
@@ -93,6 +95,8 @@ public class WsSession implements Sessio
this.localEndpoint = localEndpoint;
this.wsRemoteEndpoint = wsRemoteEndpoint;
this.wsRemoteEndpoint.setSession(this);
+this.remoteEndpointAsync = new WsRemoteEndpointAsync(wsRemoteEndpoint);
+this.remoteEndpointBasic = new WsRemoteEndpointBasic(wsRemoteEndpoint);
this.webSocketContainer = wsWebSocketContainer;
applicationClassLoader =
Thread.currentThread().getContextClassLoader();
wsRemoteEndpoint.setSendTimeout(
@@ -263,15 +267,13 @@ public class WsSession implements Sessio
@Override
public RemoteEndpoint.Async getAsyncRemote() {
-// TODO Don't create new wrappers on every call
-return new WsRemoteEndpointAsync(wsRemoteEndpoint);
+return remoteEndpointAsync;
}
@Override
public RemoteEndpoint.Basic getBasicRemote() {
-// TODO Don't create new wrappers on every call
-return new WsRemoteEndpointBasic(wsRemoteEndpoint);
+return remoteEndpointBasic;
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1449680 - in /tomcat/trunk/java/org/apache/tomcat/websocket: ./ server/
Author: markt
Date: Mon Feb 25 12:24:10 2013
New Revision: 1449680
URL: http://svn.apache.org/r1449680
Log:
Rename prior to some refactoring
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
- copied, changed from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplClient.java
- copied, changed from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointImplServer.java
- copied, changed from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointClient.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsRemoteEndpointServer.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSession.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsProtocolHandler.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsWriteTimeout.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java?rev=1449680&r1=1449679&r2=1449680&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
Mon Feb 25 12:24:10 2013
@@ -26,10 +26,10 @@ import javax.websocket.SendHandler;
// TODO Use a common base class
public class WsRemoteEndpointAsync implements RemoteEndpoint.Async {
-private final WsRemoteEndpointBase base;
+private final WsRemoteEndpointImplBase base;
-WsRemoteEndpointAsync(WsRemoteEndpointBase base) {
+WsRemoteEndpointAsync(WsRemoteEndpointImplBase base) {
this.base = base;
}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java?rev=1449680&r1=1449679&r2=1449680&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
Mon Feb 25 12:24:10 2013
@@ -27,10 +27,10 @@ import javax.websocket.RemoteEndpoint;
//TODO Use a common base class
public class WsRemoteEndpointBasic implements RemoteEndpoint.Basic {
-private final WsRemoteEndpointBase base;
+private final WsRemoteEndpointImplBase base;
-WsRemoteEndpointBasic(WsRemoteEndpointBase base) {
+WsRemoteEndpointBasic(WsRemoteEndpointImplBase base) {
this.base = base;
}
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(from r1449658,
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java&r1=1449658&r2=1449680&rev=1449680&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Mon Feb 25 12:24:10 2013
@@ -45,12 +45,12 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
-public abstract class WsRemoteEndpointBase implements RemoteEndpoint {
+public abstract class WsRemoteEndpointImplBase implements RemoteEndpoint {
private static final StringManager sm =
StringManager.getManager(Constants.PACKAGE_NAME);
-private final Log log = LogFactory.getLog(WsRemoteEndpointBase.class);
+private final Log log = LogFactory.getLog(WsRemoteEndpointImplBase.class);
private boolean messagePartInProgress = false;
private final Queue messagePartQueue = new ArrayDeque<>();
@@ -348,7 +348,7 @@ public abstract class WsRemoteEndpointBa
private final SendHandler handler;
public MessagePart(byte opCode, ByteBuffer payload, boolean last,
-SendHandler handler, WsRemoteEndpointBase endpoint
svn commit: r1449682 - in /tomcat/trunk/java/org/apache/tomcat/websocket: WsRemoteEndpointAsync.java WsRemoteEndpointBase.java WsRemoteEndpointBasic.java
Author: markt
Date: Mon Feb 25 12:30:22 2013
New Revision: 1449682
URL: http://svn.apache.org/r1449682
Log:
Pull up duplicate code to new abstract base class
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java?rev=1449682&r1=1449681&r2=1449682&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointAsync.java
Mon Feb 25 12:30:22 2013
@@ -16,53 +16,17 @@
*/
package org.apache.tomcat.websocket;
-import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.Future;
import javax.websocket.RemoteEndpoint;
import javax.websocket.SendHandler;
-// TODO Use a common base class
-public class WsRemoteEndpointAsync implements RemoteEndpoint.Async {
-
-private final WsRemoteEndpointImplBase base;
-
+public class WsRemoteEndpointAsync extends WsRemoteEndpointBase
+implements RemoteEndpoint.Async {
WsRemoteEndpointAsync(WsRemoteEndpointImplBase base) {
-this.base = base;
-}
-
-
-@Override
-public void setBatchingAllowed(boolean batchingAllowed) throws IOException
{
-base.setBatchingAllowed(batchingAllowed);
-}
-
-
-@Override
-public boolean getBatchingAllowed() {
-return base.getBatchingAllowed();
-}
-
-
-@Override
-public void flushBatch() throws IOException {
-base.flushBatch();
-}
-
-
-@Override
-public void sendPing(ByteBuffer applicationData) throws IOException,
-IllegalArgumentException {
-base.sendPing(applicationData);
-}
-
-
-@Override
-public void sendPong(ByteBuffer applicationData) throws IOException,
-IllegalArgumentException {
-base.sendPong(applicationData);
+super(base);
}
Added: 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=1449682&view=auto
==
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java
(added)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java Mon
Feb 25 12:30:22 2013
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.websocket;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+import javax.websocket.RemoteEndpoint;
+
+public abstract class WsRemoteEndpointBase implements RemoteEndpoint {
+
+protected final WsRemoteEndpointImplBase base;
+
+
+WsRemoteEndpointBase(WsRemoteEndpointImplBase base) {
+this.base = base;
+}
+
+
+@Override
+public final void setBatchingAllowed(boolean batchingAllowed) throws
IOException {
+base.setBatchingAllowed(batchingAllowed);
+}
+
+
+@Override
+public final boolean getBatchingAllowed() {
+return base.getBatchingAllowed();
+}
+
+
+@Override
+public final void flushBatch() throws IOException {
+base.flushBatch();
+}
+
+
+@Override
+public final void sendPing(ByteBuffer applicationData) throws IOException,
+IllegalArgumentException {
+base.sendPing(applicationData);
+}
+
+
+@Override
+public final void sendPong(ByteBuffer applicationData) throws IOException,
+IllegalArgumentException {
+base.sendPong(applicationData);
+}
+}
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBasic.java?rev=1449682&r1=1449681&r2=1449682&view=diff
=
[Bug 54559] [PATCH] 1.1.27 needs APR >= 1.3.0
https://issues.apache.org/bugzilla/show_bug.cgi?id=54559 Ville Skyttä changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- --- Comment #6 from Ville Skyttä --- Please note that before my initial patch (see initial comment) the minimum APR version was set to 1.2.1, now it got pushed back to 1.2.0 - I assume that's not intentional so reopening. -- 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: r1449753 - in /tomcat/native/branches/1.1.x: native/build/tcnative.m4 native/src/jnilib.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Mon Feb 25 15:40:08 2013
New Revision: 1449753
URL: http://svn.apache.org/r1449753
Log:
Followup on r1446443: compatibility version
is APR 1.2.1 not 1.2.0.
That's how it was before r1445989 (1.3.0
dependency).
APR 1.2.0 was not released, so it actually
makes no difference except someone would
try to use a non-released version.
Modified:
tomcat/native/branches/1.1.x/native/build/tcnative.m4
tomcat/native/branches/1.1.x/native/src/jnilib.c
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/branches/1.1.x/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/tcnative.m4?rev=1449753&r1=1449752&r2=1449753&view=diff
==
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Mon Feb 25 15:40:08
2013
@@ -33,10 +33,10 @@ AC_DEFUN(TCN_FIND_APR,[
sapr_version="`echo $sapr_pversion|sed -e 's/\([a-z]*\)$/.\1/'`"
tc_save_IFS=$IFS; IFS=.; set $sapr_version; IFS=$tc_save_IFS
if test "${1}" -lt "1"; then
-AC_MSG_ERROR(You need APR version 1.2.0 or newer installed. For optimal
performance version 1.3.0 or newer is needed.)
+AC_MSG_ERROR(You need APR version 1.2.1 or newer installed. For optimal
performance version 1.3.0 or newer is needed.)
else
if test "${2}" -lt "2"; then
- AC_MSG_ERROR(You need APR version 1.2.0 or newer installed. For optimal
performance version 1.3.0 or newer is needed.)
+ AC_MSG_ERROR(You need APR version 1.2.1 or newer installed. For optimal
performance version 1.3.0 or newer is needed.)
elif test "${2}" -lt "3"; then
AC_MSG_WARN(For optimal performance you need APR version 1.3.0 or newer
installed.)
fi
Modified: tomcat/native/branches/1.1.x/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/jnilib.c?rev=1449753&r1=1449752&r2=1449753&view=diff
==
--- tomcat/native/branches/1.1.x/native/src/jnilib.c (original)
+++ tomcat/native/branches/1.1.x/native/src/jnilib.c Mon Feb 25 15:40:08 2013
@@ -63,7 +63,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
*/
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
-if (apvn < 1200) {
+if (apvn < 1201) {
tcn_Throw(env, "Unupported APR version (%s)",
apr_version_string());
return JNI_ERR;
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1449753&r1=1449752&r2=1449753&view=diff
==
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Mon Feb 25
15:40:08 2013
@@ -43,7 +43,7 @@
from Tomcat trunk using svn:externals. (rjung)
- Minimum supported APR version is now again 1.2.0. Version 1.3.0
+ Minimum supported APR version is now again 1.2.1. Version 1.3.0
of APR improves performance. (rjung)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat Maven plugin 2.1
Hi, The Apache Tomcat is pleased to announce the release of the 2.1 version. This plugin can used to run your war project inside an embeded Apache Tomcat and to deploy your project to a running Apache Tomcat instance. Documentation available: http://tomcat.apache.org/maven-plugin-2.1/index.html Release Notes - Apache Tomcat Maven Plugin - Version 2.1 ** Bug * [MTOMCAT-61] - maven tomcat:run ignores the useSeperateTomcatClassloaded when using serverXml property * [MTOMCAT-119] - tomcat7:run-war fails because it expects META-INF\context.xml * [MTOMCAT-128] - The plugin ignores and/or parses web.xml incorrectally when using tomcatWebXml option * [MTOMCAT-173] - Direct dependencies are not added to classpath * [MTOMCAT-175] - warDirectory property has wrong standard value in release version 2.0 * [MTOMCAT-179] - Null pointer dereference in RunMojo * [MTOMCAT-180] - Allow hostName and alias to be configured for tomcat6:run etc * [MTOMCAT-182] - Typo in Tomcat6 AbstractRunWarMojo MOJO * [MTOMCAT-185] - change phase for tomcat6/7:run to process-classes * [MTOMCAT-186] - Closing executable JAR does not call ServletContextListener.contextDestroyed() * [MTOMCAT-194] - Odd error message in switching from Codehaus to Maven Tomcat6 plugin * [MTOMCAT-197] - tomcat7:undeploy goal not ignoring non-war projects * [MTOMCAT-198] - Fix base classes for redeploy and redeploy-only goals * [MTOMCAT-206] - Runtime dependencies within multi module projects are not loaded. ** Improvement * [MTOMCAT-99] - Make redeploy goal consistent with deploy goals * [MTOMCAT-188] - Allow for the creation of a war that is both executable and deployable * [MTOMCAT-190] - Client Certificate settings for connector * [MTOMCAT-191] - Return the "redeploy" goal to the Maven plugin * [MTOMCAT-192] - Website text cleanup * [MTOMCAT-199] - Text cleanup of goal definitions * [MTOMCAT-200] - Tomcat7:redeploy * [MTOMCAT-208] - JaCoCo instrumentation errors when running StandaloneWarMojo ** New Feature * [MTOMCAT-163] - No undeploy goal ** Question * [MTOMCAT-187] - Scan resources executing run goal Have Fun, -- The Apache Tomcat Team. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54559] [PATCH] 1.1.27 needs APR >= 1.3.0
https://issues.apache.org/bugzilla/show_bug.cgi?id=54559 Rainer Jung changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #7 from Rainer Jung --- Thanks for the QA. Fixed in r1449753. Note that the difference between checking against 1.2.0 and 1.2.1 is small, because it seems 1.2.0 was not released. -- 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: r1449771 - /tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm
Author: olamy
Date: Mon Feb 25 16:40:06 2013
New Revision: 1449771
URL: http://svn.apache.org/r1449771
Log:
escape interpolation in this documentation page
Modified:
tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm
Modified: tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm?rev=1449771&r1=1449770&r2=1449771&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm Mon Feb 25
16:40:06 2013
@@ -57,13 +57,13 @@ Run Mojo: run your Maven war project qui
/
- ${tomcatContextXml}
+ \${tomcatContextXml}
-
${project.build.directory}/appserver-base
-
${project.build.directory}/appserver-home
-
${project.build.directory}/appserver-base/logs
-${project.build.directory}
+
\${project.build.directory}/appserver-base
+
\${project.build.directory}/appserver-home
+
\${project.build.directory}/appserver-base/logs
+\${project.build.directory}
false
@@ -77,7 +77,7 @@ Run Mojo: run your Maven war project qui
org.apache.derby
derby
-${derbyVersion}
+\${derbyVersion}
javax.mail
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1449772 - /tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm
Author: olamy Date: Mon Feb 25 16:40:19 2013 New Revision: 1449772 URL: http://svn.apache.org/r1449772 Log: doc update date Modified: tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm Modified: tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm?rev=1449772&r1=1449771&r2=1449772&view=diff == --- tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm (original) +++ tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm Mon Feb 25 16:40:19 2013 @@ -3,7 +3,7 @@ --- Oliver Lamy --- - 2011-01-10 + 2013-02-25 --- ~~ Licensed to the Apache Software Foundation (ASF) under one - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1449775 [12/24] - in /tomcat/site/trunk/docs/maven-plugin-trunk: ./ apidocs/ apidocs/class-use/ apidocs/org/apache/tomcat/maven/common/config/ apidocs/org/apache/tomcat/maven/common/confi
Modified: tomcat/site/trunk/docs/maven-plugin-trunk/tomcat-maven-plugin-it/dependencies.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-trunk/tomcat-maven-plugin-it/dependencies.html?rev=1449775&r1=1449774&r2=1449775&view=diff == --- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat-maven-plugin-it/dependencies.html (original) +++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat-maven-plugin-it/dependencies.html Mon Feb 25 16:47:21 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Integration Tests - Project Dependencies @@ -156,8 +156,8 @@ - Last Published: 20 February 2013 | - Version: 2.1-SNAPSHOT + Last Published: 25 February 2013 | + Version: 2.2-SNAPSHOT @@ -183,13 +183,13 @@ } } -Dependency Treeorg.apache.tomcat.maven:tomcat-maven-plugin-it:jar:2.1-SNAPSHOT Apache Tomcat Maven Plugin :: Integration TestsDescription: The Tomcat Maven Plugin provides goals to manipulate WAR projects within the Tomcat servlet -container.URL: http://tomcat.apache.org/maven-plugin-trunk/tomcat-maven-plugin-it";>http://tomcat.apache.org/maven-plugin-trunk/tomcat-maven-plugin-itProject License: http://www.apache.org/licenses/LICENSE-2.0.txt";>The Apache Software License, Version 2.0junit:junit:jar:4.10 (compile) JUnitDescription: JUnit is a regression testing framework written by Erich Gamma and Kent Beck. -It is used by the developer who implements unit tests in Java.URL: http://junit.org";>http://junit.orgProject License: http://www.opensource.org/licenses/cpl1.0.txt";>Common Public License Version 1.0org.hamcrest:hamcrest-core:jar:1.1 (compile) Hamcrest CoreDescription: There is currently no description associated with this project.Project License: http://www.opensource.org/licenses/bsd-license.php";>BSD stylejuni t-addons:junit-addons:jar:1.4 (compile) junit-addonsDescription: There is currently no description associated with this project.Project License: No license is defined for this project.xerces:xercesImpl:jar:2.6.2 (compile) xercesImplDescription: There is c urrently no description associated with this project.Project License: No license is defined for this project.xerces:xmlParserAPIs:jar:2.6.2 (compile) xmlParserAPIsDescription: There is currently no description associated with this project.Project License: No license is defined for this project.org.apache.maven.shared:maven-verifier:jar:1.3 (compile) Maven Verifier ComponentDescription: Provides a test harness for Maven integration tests.URL: http://maven.apache.org/shared/maven-verifier/";>http://maven.apache.org/shared/maven-verifier/Project License: http://www.apache.org/licenses/LICENSE-2.0.txt";>The Apache Software License, Version 2.0org.apache.httpcomponents:httpclient:jar:4.2-alpha1 (compile) HttpClientDe scription: HttpComponents Client (base module)URL: http://hc.apache.org/httpcomponents-client";>http://hc.apache.org/httpcomponents-clientProject License: Apache Licenseorg.apache.httpcomponents:httpcore:jar:4.2-alpha2 (compile) HttpCoreDescription: HttpComponents Core (blocking I/O)URL: http://hc.apache.org/httpcomponents-core-ga";>http://hc.apache.org/httpcomponents-core-gaProject License: Apache Licensecommons-logging:commons-logging:jar:1.1.1 (compile) Commons LoggingDescription: Commons Logging is a thin adapter allowing configurable bridging to other, -well known logging systems.URL: http://commons.apache.org/logging";>http://commons.apache.org/loggingProject License: http://www.apache.org/licenses/LICENSE-2.0.txt";>The Apache Software License, Version 2.0commons-codec:commons-codec:jar:1.6 (compile) Commons CodecDescription: The codec package contains simple encoder and decoders for +Dependency Treeorg.apache.tomcat.maven:tomcat-maven-plugin-it:jar:2.2-SNAPSHOT Apache Tomcat Maven Plugin :: Integration TestsDescription: The Tomcat Maven Plugin provides goals to manipulate WAR projects within the Tomcat servlet +container.URL: http://tomcat.apache.org/maven-plugin-trunk/tomcat-maven-plugin-it";>http://tomcat.apache.org/maven-plugin-trunk/tomcat-maven-plugin-itProject License: http://www.apache.org/licenses/LICENSE-2.0.txt";>The Apache Software License, Version 2.0junit:junit:jar:4.10 (compile) JUnitDescription: JUnit is a regression testing framework written by Erich Gamma and Kent Beck. +It is used by the developer who implements unit tests in Java.URL: http://junit.org";>http://junit.orgProject License: http://www.opensource.org/licenses/cpl1.0.txt";>Common Public License Version 1.0org.hamcrest:hamcrest-core:jar:1.1 (compile) Hamcrest CoreDescription: There is currentl
svn commit: r1449775 [18/24] - in /tomcat/site/trunk/docs/maven-plugin-trunk: ./ apidocs/ apidocs/class-use/ apidocs/org/apache/tomcat/maven/common/config/ apidocs/org/apache/tomcat/maven/common/confi
Modified: tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/redeploy-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/redeploy-mojo.html?rev=1449775&r1=1449774&r2=1449775&view=diff == --- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/redeploy-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/redeploy-mojo.html Mon Feb 25 16:47:21 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:redeploy @@ -213,8 +213,8 @@ - Last Published: 20 February 2013 | - Version: 2.1-SNAPSHOT + Last Published: 25 February 2013 | + Version: 2.2-SNAPSHOT @@ -227,7 +227,7 @@ tomcat6:redeploy Full name: - org.apache.tomcat.maven:tomcat6-maven-plugin:2.1-SNAPSHOT:redeploy + org.apache.tomcat.maven:tomcat6-maven-plugin:2.2-SNAPSHOT:redeploy Description: Redeploy a WAR in Tomcat. (Alias for the deploy goal with its update parameter set to true.) Modified: tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/redeploy-only-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/redeploy-only-mojo.html?rev=1449775&r1=1449774&r2=1449775&view=diff == --- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/redeploy-only-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/redeploy-only-mojo.html Mon Feb 25 16:47:21 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:redeploy-only @@ -213,8 +213,8 @@ - Last Published: 20 February 2013 | - Version: 2.1-SNAPSHOT + Last Published: 25 February 2013 | + Version: 2.2-SNAPSHOT @@ -227,7 +227,7 @@ tomcat6:redeploy-only Full name: - org.apache.tomcat.maven:tomcat6-maven-plugin:2.1-SNAPSHOT:redeploy-only + org.apache.tomcat.maven:tomcat6-maven-plugin:2.2-SNAPSHOT:redeploy-only Description: Redeploy a WAR in Tomcat without forking the package lifecycle. (Alias for the deploy-only goal with its update parameter set to Modified: tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/reload-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/reload-mojo.html?rev=1449775&r1=1449774&r2=1449775&view=diff == --- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/reload-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/reload-mojo.html Mon Feb 25 16:47:21 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:reload @@ -213,8 +213,8 @@ - Last Published: 20 February 2013 | - Version: 2.1-SNAPSHOT + Last Published: 25 February 2013 | + Version: 2.2-SNAPSHOT @@ -227,7 +227,7 @@ tomcat6:reload Full name: - org.apache.tomcat.maven:tomcat6-maven-plugin:2.1-SNAPSHOT:reload + org.apache.tomcat.maven:tomcat6-maven-plugin:2.2-SNAPSHOT:reload Description: Reload a WAR in Tomcat. Attributes: Modified: tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/resources-mojo.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/resources-mojo.html?rev=1449775&r1=1449774&r2=1449775&view=diff == --- tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/resources-mojo.html (original) +++ tomcat/site/trunk/docs/maven-plugin-trunk/tomcat6-maven-plugin/resources-mojo.html Mon Feb 25 16:47:21 2013 @@ -1,13 +1,13 @@ http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> - + Apache Tomcat Maven Plugin :: Tomcat 6.x - tomcat6:resources @@ -213,8 +213,8 @@ - Last Published: 20 February 2013 | - V
How to do a clean connector shut down?
Hi
I need to start and stop a connector inside a servlet.
That works with the following code:
final org.apache.catalina.connector.Connector nioConnector =
new org.apache.catalina.connector.Connector(
"org.apache.coyote.http11.Http11NioProtocol" );
nioConnector.setAttribute( "executor", "osiris4Executor" );
nioConnector.setPort( port );
nioConnector.setRedirectPort( 443 );
service.addConnector( nioConnector );
Then I can access the application using that port.
I can also remove the connector again:
try {
nioConnector.stop();
} catch ( LifecycleException e ) {
e.printStackTrace();
}
service.removeConnector( nioConnector );
However, I seem to miss some step, because a
"NioBlockingSelector.BlockPoller-X" thread is left.
As I called the upper code in a testcase in a loop I ended up with lots of
such threads.
What do I have to do to completely remove a connector?
(BTW: How can I find and use an executor that is defined in server.xml using
the code above?)
Regards,
Steffen
smime.p7s
Description: S/MIME cryptographic signature
svn commit: r1449881 - /tomcat/maven-plugin/trunk/src/site/site.xml
Author: olamy
Date: Mon Feb 25 20:46:15 2013
New Revision: 1449881
URL: http://svn.apache.org/r1449881
Log:
reduce noise when publishing doc
Modified:
tomcat/maven-plugin/trunk/src/site/site.xml
Modified: tomcat/maven-plugin/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1449881&r1=1449880&r2=1449881&view=diff
==
--- tomcat/maven-plugin/trunk/src/site/site.xml (original)
+++ tomcat/maven-plugin/trunk/src/site/site.xml Mon Feb 25 20:46:15 2013
@@ -30,7 +30,7 @@
org.apache.maven.skins
maven-fluido-skin
-1.3.0
+1.3.1-SNAPSHOT
@@ -38,6 +38,7 @@
true
false
width: auto;
+ true
${project.url}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54609] New: Running service install on 7.0.37 on Windows 2008 adds unexpected characters to service executable path
https://issues.apache.org/bugzilla/show_bug.cgi?id=54609 Bug ID: 54609 Summary: Running service install on 7.0.37 on Windows 2008 adds unexpected characters to service executable path Product: Tomcat 7 Version: 7.0.37 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Packaging Assignee: dev@tomcat.apache.org Reporter: cduplich...@jackhenry.com Classification: Unclassified Created attachment 29991 --> https://issues.apache.org/bugzilla/attachment.cgi?id=29991&action=edit Comparing 7.0.35 to 7.0.37 Please see the attached screenshot for a comparison of service install between versions 7.0.35 and 7.0.37. Performed the following steps: 1. Downloaded tomcat 7.0.35 and tomcat 7.0.37 onto a Windows Server 2008 VM. 2. Extracted to different directories 3. In two different command prompt windows, ran "tomcat7.exe //IS//tomcat..test" 4. Opened service properties and checked executable path. Tomcat 7.0.35 path: "C:\Tomcat Test\apache-tomcat-7.0.35-windows-x64\apache-tomcat-7.0.35\bin\tomcat7.exe" //RS//tomcat7.0.35.test Tomcat 7.0.37 path: "C:\Tomcat Test\apache-tomcat-7.0.37-windows-x64\apache-tomcat-7.0.37\bin\tomcat7.exe" 02-25.lot//RS//tomcat7.0.37.test Please notice the "02-25.lot" in the 7.0.37 path, also visible in the screenshot. -- 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 54609] Running service install on 7.0.37 on Windows 2008 adds unexpected characters to service executable path
https://issues.apache.org/bugzilla/show_bug.cgi?id=54609 Clark changed: What|Removed |Added CC||cduplich...@jackhenry.com OS||All -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: How to do a clean connector shut down?
2013/2/26 Steffen Heil (Mailinglisten) :
> Hi
>
> I need to start and stop a connector inside a servlet.
> That works with the following code:
>
> final org.apache.catalina.connector.Connector nioConnector =
> new org.apache.catalina.connector.Connector(
> "org.apache.coyote.http11.Http11NioProtocol" );
> nioConnector.setAttribute( "executor", "osiris4Executor" );
> nioConnector.setPort( port );
> nioConnector.setRedirectPort( 443 );
> service.addConnector( nioConnector );
>
> Then I can access the application using that port.
> I can also remove the connector again:
>
> try {
> nioConnector.stop();
> } catch ( LifecycleException e ) {
> e.printStackTrace();
> }
> service.removeConnector( nioConnector );
>
> However, I seem to miss some step, because a
> "NioBlockingSelector.BlockPoller-X" thread is left.
> As I called the upper code in a testcase in a loop I ended up with lots of
> such threads.
>
Tomcat version = ?
I'd call destroy()
http://tomcat.apache.org/tomcat-7.0-doc/api/org/apache/catalina/Lifecycle.html
> What do I have to do to completely remove a connector?
>
> (BTW: How can I find and use an executor that is defined in server.xml using
> the code above?)
service.getExecutor(executorName)
nioConnector.getProtocolHandler().setExecutor(executor)
(as used by o.a.c.startup.ConnectorCreateRule )
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54609] Running service install on 7.0.37 on Windows 2008 adds unexpected characters to service executable path
https://issues.apache.org/bugzilla/show_bug.cgi?id=54609 Chuck Caldarale changed: What|Removed |Added OS|All |Windows Server 2008 -- 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
