Author: olamy Date: Tue Oct 22 01:31:41 2013 New Revision: 1534451 URL: http://svn.apache.org/r1534451 Log: [MTOMCAT-176] Make deploy/redeploy (upload) less verbose for --batch-mode / --quiet
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/AbstractCatalinaMojo.java tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.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=1534451&r1=1534450&r2=1534451&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 Tue Oct 22 01:31:41 2013 @@ -109,6 +109,11 @@ public class TomcatManager */ private BasicHttpContext localContext; + /** + * @since 2.2 + */ + private boolean interactive; + // ---------------------------------------------------------------------- // Constructors // ---------------------------------------------------------------------- @@ -159,10 +164,25 @@ public class TomcatManager */ public TomcatManager( URL url, String username, String password, String charset ) { + this( url, username, password, charset, true ); + } + + /** + * Creates a Tomcat manager wrapper for the specified URL, username, password and URL encoding. + * + * @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 + * @param charset the URL encoding charset to use when communicating with Tomcat manager + * @param interactive if the build is in interactive mode (batch mode otherwise) + */ + public TomcatManager( URL url, String username, String password, String charset , boolean interactive ) + { this.url = url; this.username = username; this.password = password; this.charset = charset; + this.interactive = interactive; PoolingClientConnectionManager poolingClientConnectionManager = new PoolingClientConnectionManager(); poolingClientConnectionManager.setMaxTotal( 5 ); @@ -707,7 +727,7 @@ public class TomcatManager { HttpPut httpPut = new HttpPut( url + path ); - httpPut.setEntity( new RequestEntityImplementation( data, length, url + path ) ); + httpPut.setEntity( new RequestEntityImplementation( data, length, url + path, interactive ) ); httpRequestBase = httpPut; @@ -789,7 +809,7 @@ public class TomcatManager private long startTime; - private RequestEntityImplementation( final File file, long length, String url ) + private RequestEntityImplementation( final File file, long length, String url, boolean interactive ) { this.file = file; this.length = length; @@ -883,6 +903,9 @@ public class TomcatManager public void transferProgressed( long completedSize, long totalSize ) { + if (!interactive) { + return; + } StringBuilder buffer = new StringBuilder( 64 ); Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java?rev=1534451&r1=1534450&r2=1534451&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractCatalinaMojo.java Tue Oct 22 01:31:41 2013 @@ -214,7 +214,7 @@ public abstract class AbstractCatalinaMo //getLog( ).debug( "user user/password " + userName + "/" + password ); } - manager = new TomcatManager( url, userName, password, charset ); + manager = new TomcatManager( url, userName, password, charset, settings.isInteractiveMode() ); manager.setUserAgent( name + "/" + version ); } Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java?rev=1534451&r1=1534450&r2=1534451&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractI18NTomcat6Mojo.java Tue Oct 22 01:31:41 2013 @@ -22,6 +22,7 @@ import org.apache.maven.plugin.AbstractM import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.settings.Settings; import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse; import org.apache.tomcat.maven.common.messages.MessagesProvider; @@ -35,6 +36,9 @@ public abstract class AbstractI18NTomcat extends AbstractMojo { + @Component + protected Settings settings; + @Component(role = MessagesProvider.class) protected MessagesProvider messagesProvider; Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java?rev=1534451&r1=1534450&r2=1534451&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java Tue Oct 22 01:31:41 2013 @@ -216,7 +216,7 @@ public abstract class AbstractCatalinaMo password = this.password == null ? "" : this.password; } - manager = new TomcatManager( url, userName, password, charset ); + manager = new TomcatManager( url, userName, password, charset, settings.isInteractiveMode() ); manager.setUserAgent( name + "/" + version ); } Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java?rev=1534451&r1=1534450&r2=1534451&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java (original) +++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java Tue Oct 22 01:31:41 2013 @@ -22,6 +22,7 @@ import org.apache.maven.plugin.AbstractM import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Component; import org.apache.maven.plugins.annotations.Parameter; +import org.apache.maven.settings.Settings; import org.apache.tomcat.maven.common.deployer.TomcatManagerResponse; import org.apache.tomcat.maven.common.messages.MessagesProvider; @@ -33,6 +34,9 @@ public abstract class AbstractTomcat7Moj extends AbstractMojo { @Component + protected Settings settings; + + @Component protected MessagesProvider messagesProvider; // ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org