svn commit: r1212618 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml
Author: olamy Date: Fri Dec 9 20:42:05 2011 New Revision: 1212618 URL: http://svn.apache.org/viewvc?rev=1212618&view=rev Log: upgrade some dependencies version Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 20:42:05 2011 @@ -61,6 +61,11 @@ + org.apache.httpcomponents + fluent-hc + + + org.apache.tomcat tomcat-catalina 7.0.22 Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Fri Dec 9 20:42:05 2011 @@ -46,8 +46,8 @@ 2.0.8 false -2.10 -4.9 +2.11 +4.10 2000 false false @@ -471,22 +471,27 @@ org.apache.httpcomponents httpclient -4.1.2 +4.2-alpha1 + + +org.apache.httpcomponents +fluent-hc +4.2-alpha1 org.slf4j slf4j-api -1.6.1 +1.6.4 ch.qos.logback logback-core -0.9.30 +1.0.0 ch.qos.logback logback-classic -0.9.30 +1.0.0 @@ -507,7 +512,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.10 + 2.11 org.apache.maven.plugins - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212619 - /tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
Author: olamy
Date: Fri Dec 9 20:42:21 2011
New Revision: 1212619
URL: http://svn.apache.org/viewvc?rev=1212619&view=rev
Log:
upgrade tomcat6 plugin to use 6.0.35 artifacts
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1212619&r1=1212618&r2=1212619&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Fri Dec 9 20:42:21
2011
@@ -34,7 +34,7 @@
-6.0.33
+6.0.35
${basedir}/target/
${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war
${basedir}/src/test/keystore
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1212618 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml
2011/12/10 : > Author: olamy > Date: Fri Dec 9 20:42:05 2011 > New Revision: 1212618 > > URL: http://svn.apache.org/viewvc?rev=1212618&view=rev > Log: > upgrade some dependencies version > > Modified: > tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml > tomcat/maven-plugin/trunk/pom.xml > > Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml > URL: > http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff > == > --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) > +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 > 20:42:05 2011 > @@ -61,6 +61,11 @@ > > > > + org.apache.httpcomponents > + fluent-hc > + > + > + > org.apache.tomcat > tomcat-catalina > 7.0.22 7.0.23? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Timing for 7.0.24
2011/12/8 Mark Thomas : > Since 7.0.23 was rather later than the expected 1 Nov 2011 date > originally planned, I intend to aim for 7.0.24 early in the New Year. If > anything pressing comes along before then (the Realm issue is easily > worked around so I am not too concerned about that) I'm happy to > re-evaluate. > > I'm aiming to work through the open bugs between now and then. I'm > currently working on 52184. > I like the plan. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 52316] New: AccessLog does not log size for files sent with sendfile
https://issues.apache.org/bugzilla/show_bug.cgi?id=52316
Bug #: 52316
Summary: AccessLog does not log size for files sent with
sendfile
Product: Tomcat 7
Version: 7.0.23
Platform: PC
OS/Version: Windows XP
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: knst.koli...@gmail.com
Classification: Unclassified
Confirming a problem reported on the users@ list.
This affects both NIO and APR protocols when file is delivered with sendfile.
Note, that the file have to be >48kb to trigger use of sendfile.
Steps to reproduce:
1) Configure three connectors:
and configure AccessLogValve in a :
The difference from common pattern is that I added "(%D ms)" at the end.
2) Put some big file (>48k) as webapps/ROOT/file
3) Download it 3 times:
http://localhost:8081/file?8081
http://localhost:8082/file?8082
http://localhost:8083/file?8083
4) Access Log:
127.0.0.1 - - [10/Dec/2011:01:05:08 +0300] "GET /file?8081 HTTP/1.1" 200
15027784 (4766 ms)
127.0.0.1 - - [10/Dec/2011:01:05:23 +0300] "GET /file?8082 HTTP/1.1" 200 - (31
ms)
127.0.0.1 - - [10/Dec/2011:01:05:48 +0300] "GET /file?8083 HTTP/1.1" 200 - (16
ms)
Note that '-' is printed instead of file size for Nio and Apr connectors.
Workarounds:
A). Disable sendfile with useSendfile="false" on a connector
B). Add the following pattern to AccessLogValve:
"%{org.apache.tomcat.sendfile.start}r %{org.apache.tomcat.sendfile.end}r"
That will log the range of bytes sent by sendfile.
E.g.:
127.0.0.1 - - [10/Dec/2011:01:05:08 +0300] "GET /file?8081 HTTP/1.1" 200
15027784 (4766 ms) - -
127.0.0.1 - - [10/Dec/2011:01:05:23 +0300] "GET /file?8082 HTTP/1.1" 200 - (31
ms) 0 15027784
127.0.0.1 - - [10/Dec/2011:01:05:48 +0300] "GET /file?8083 HTTP/1.1" 200 - (16
ms) 0 15027784
--
Overall, looking at the timing value printed by %D I would say that logging
occurs before data are sent. So the value of 0 bytes is correct.
It could be possible to log file size from request attributes set by sendfile,
but that cannot account for aborted downloads. Though I think that would be
better than the current logging of '0'.
At least this limitation can be mentioned in documentation for %b and %B
patterns in AccessLogValve section in valve.html and in Javadoc.
--
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1212618 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml
2011/12/9 Konstantin Kolinko : > 2011/12/10 : >> Author: olamy >> Date: Fri Dec 9 20:42:05 2011 >> New Revision: 1212618 >> >> URL: http://svn.apache.org/viewvc?rev=1212618&view=rev >> Log: >> upgrade some dependencies version >> >> Modified: >> tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml >> tomcat/maven-plugin/trunk/pom.xml >> >> Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml >> URL: >> http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff >> == >> --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) >> +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 >> 20:42:05 2011 >> @@ -61,6 +61,11 @@ >> >> >> >> + org.apache.httpcomponents >> + fluent-hc >> + >> + >> + >> org.apache.tomcat >> tomcat-catalina >> 7.0.22 > > 7.0.23? Done in the top level pom (see the property 7.0.23 ) in fact the version it's not really important here as the real version used by the tomcat7 plugin is defined on his own pom. See the scope which is provided to ensure we don't have it by transitivity in the tomcat6 plugin. In this common module the goal is only to have o.a.c.l.WebappLoader for compilation purpose. Btw I see an issue as there are two properties to define the tomcat7 version used. I will fix that. > > Best regards, > Konstantin Kolinko > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -- 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
svn commit: r1212685 - in /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin: pom.xml src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Author: olamy Date: Fri Dec 9 23:32:13 2011 New Revision: 1212685 URL: http://svn.apache.org/viewvc?rev=1212685&view=rev Log: use asf httpclient and add preemptive support to avoid uploading twice Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212685&r1=1212684&r2=1212685&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 23:32:13 2011 @@ -66,6 +66,11 @@ + org.apache.httpcomponents + httpclient + + + org.apache.tomcat tomcat-catalina 7.0.22 Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1212685&r1=1212684&r2=1212685&view=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java Fri Dec 9 23:32:13 2011 @@ -20,22 +20,35 @@ package org.apache.tomcat.maven.common.d */ import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.http.HttpHost; +import org.apache.http.HttpResponse; +import org.apache.http.auth.AuthScope; +import org.apache.http.auth.Credentials; +import org.apache.http.auth.UsernamePasswordCredentials; +import org.apache.http.client.AuthCache; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.client.methods.HttpPut; +import org.apache.http.client.methods.HttpRequestBase; +import org.apache.http.client.protocol.ClientContext; +import org.apache.http.entity.AbstractHttpEntity; +import org.apache.http.impl.auth.BasicScheme; +import org.apache.http.impl.client.BasicAuthCache; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.impl.conn.BasicClientConnectionManager; +import org.apache.http.protocol.BasicHttpContext; -import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; -import java.net.HttpURLConnection; import java.net.URL; import java.net.URLEncoder; /** * FIXME http connection tru a proxy - * FIXME preemptive support - * FIXME move to ASF httpclient ? * A Tomcat manager webapp invocation wrapper. - * + * * @author Mark Hobson * @version $Id: TomcatManager.java 12852 2010-10-12 22:04:32Z thragor $ */ @@ -79,6 +92,10 @@ public class TomcatManager */ private String userAgent; +private DefaultHttpClient httpClient; + +private BasicHttpContext localContext; + // -- // Constructors // -- @@ -86,7 +103,7 @@ public class TomcatManager /** * Creates a Tomcat manager wrapper for the specified URL that uses a username of admin, an empty * password and ISO-8859-1 URL encoding. - * + * * @param url the full URL of the Tomcat manager instance to use */ public TomcatManager( URL url ) @@ -97,8 +114,8 @@ public class TomcatManager /** * Creates a Tomcat manager wrapper for the specified URL and username that uses an empty password and ISO-8859-1 * URL encoding. - * - * @param url the full URL of the Tomcat manager instance to use + * + * @param url the full URL of the Tomcat manager instance to use * @param username the username to use when authenticating with Tomcat manager */ public TomcatManager( URL url, String username ) @@ -108,8 +125,8 @@ public class TomcatManager /** * Creates a Tomcat manager wrapper for the specified URL, username and password that uses ISO-8859-1 URL encoding. - * - * @param url the full URL of the Tomcat manager instance to use + * + * @param url the full URL of the Tomcat manager instance to use * @param username the username to use when authenticating with Tomcat manager * @param password the password to use when authenticating with Tomcat manager */ @@ -118,13 +135,14 @@ public
svn commit: r1212686 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/ tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugi
Author: olamy
Date: Fri Dec 9 23:33:05 2011
New Revision: 1212686
URL: http://svn.apache.org/viewvc?rev=1212686&view=rev
Log:
add a bean to return more informations from a tomcat manager call
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1212686&r1=1212685&r2=1212686&view=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Fri Dec 9 23:33:05 2011
@@ -244,7 +244,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, URL war )
+public TomcatManagerResponse deploy( String path, URL war )
throws TomcatManagerException, IOException
{
return deploy( path, war, false );
@@ -261,7 +261,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, URL war, boolean update )
+public TomcatManagerResponse deploy( String path, URL war, boolean update )
throws TomcatManagerException, IOException
{
return deploy( path, war, update, null );
@@ -279,7 +279,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, URL war, boolean update, String tag )
+public TomcatManagerResponse deploy( String path, URL war, boolean update,
String tag )
throws TomcatManagerException, IOException
{
return deployImpl( path, null, war, null, update, tag );
@@ -294,7 +294,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, InputStream war )
+public TomcatManagerResponse deploy( String path, InputStream war )
throws TomcatManagerException, IOException
{
return deploy( path, war, false );
@@ -311,7 +311,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOExceptionif an i/o error occurs
*/
-public String deploy( String path, InputStream war, boolean update )
+public TomcatManagerResponse deploy( String path, InputStream war, boolean
update )
throws TomcatManagerException, IOException
{
return deploy( path, war, update, null );
@@ -329,7 +329,7 @@ public class TomcatManager
* @throws Tom
svn commit: r1212687 - /tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
Author: olamy
Date: Fri Dec 9 23:33:29 2011
New Revision: 1212687
URL: http://svn.apache.org/viewvc?rev=1212687&view=rev
Log:
gloups miss adding a file
Added:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
(with props)
Added:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java?rev=1212687&view=auto
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
(added)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
Fri Dec 9 23:33:29 2011
@@ -0,0 +1,70 @@
+package org.apache.tomcat.maven.common.deployer;
+/*
+ * 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.
+ */
+
+/**
+ * @author Olivier Lamy
+ * @since 2.0
+ */
+public class TomcatManagerResponse
+{
+private int statusCode;
+
+private String reasonPhrase;
+
+private String httpResponseBody;
+
+public TomcatManagerResponse()
+{
+// no op
+}
+
+public int getStatusCode()
+{
+return statusCode;
+}
+
+public TomcatManagerResponse setStatusCode( int statusCode )
+{
+this.statusCode = statusCode;
+return this;
+}
+
+public String getReasonPhrase()
+{
+return reasonPhrase;
+}
+
+public TomcatManagerResponse setReasonPhrase( String reasonPhrase )
+{
+this.reasonPhrase = reasonPhrase;
+return this;
+}
+
+public String getHttpResponseBody()
+{
+return httpResponseBody;
+}
+
+public TomcatManagerResponse setHttpResponseBody( String httpResponseBody )
+{
+this.httpResponseBody = httpResponseBody;
+return this;
+}
+}
Propchange:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
--
svn:eol-style = native
Propchange:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerResponse.java
--
svn:keywords = Author Date Id Revision
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1212689 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml tomcat7-maven-plugin/pom.xml
Author: olamy
Date: Fri Dec 9 23:33:43 2011
New Revision: 1212689
URL: http://svn.apache.org/viewvc?rev=1212689&view=rev
Log:
remove redundant property to declare tomcat7 version use
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212689&r1=1212688&r2=1212689&view=diff
==
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9
23:33:43 2011
@@ -73,7 +73,7 @@
org.apache.tomcat
tomcat-catalina
- 7.0.22
+ ${tomcat7Version}
provided
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1212689&r1=1212688&r2=1212689&view=diff
==
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Fri Dec 9 23:33:43
2011
@@ -33,7 +33,6 @@
-7.0.22
${basedir}/target/
${basedir}/src/test/simple-war-project-1.0-SNAPSHOT.war
${basedir}/src/test/keystore
@@ -43,88 +42,88 @@
org.apache.tomcat.embed
tomcat-embed-core
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-util
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-coyote
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-api
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-jdbc
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-dbcp
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-servlet-api
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-jsp-api
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-jasper
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-jasper-el
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-el-api
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-catalina
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-tribes
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-catalina-ha
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat
tomcat-annotations-api
- ${tomcat.version}
+ ${tomcat7Version}
@@ -133,18 +132,18 @@
org.apache.tomcat
tomcat-juli
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat.embed
tomcat-embed-logging-juli
- ${tomcat.version}
+ ${tomcat7Version}
org.apache.tomcat.embed
tomcat-embed-logging-log4j
- ${tomcat.version}
+ ${tomcat7Version}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
