You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2013/09/02 08:09:49 UTC
svn commit: r1519351 -
/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/
Author: olamy
Date: Mon Sep 2 06:09:48 2013
New Revision: 1519351
URL: http://svn.apache.org/r1519351
Log:
fix formatting
Modified:
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
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployMojo.java Mon Sep 2 06:09:48 2013
@@ -169,10 +169,10 @@ public abstract class AbstractDeployMojo
getLog().info( messagesProvider.getMessage( "AbstractDeployMojo.deployingWar", getDeployedURL() ) );
URL warURL = getWarFile().toURL();
-
- TomcatManagerResponse tomcatResponse = getManager().deploy( getPath(), warURL, isUpdate(), getTag() ) ;
-
- checkTomcatResponse(tomcatResponse) ;
+
+ TomcatManagerResponse tomcatResponse = getManager().deploy( getPath(), warURL, isUpdate(), getTag() );
+
+ checkTomcatResponse( tomcatResponse );
}
/**
@@ -214,8 +214,9 @@ public abstract class AbstractDeployMojo
URL warURL = getWarFile().toURL();
URL contextURL = getContextFile().toURL();
- TomcatManagerResponse tomcatResponse = getManager().deployContext( getPath(), contextURL, warURL, isUpdate(), getTag() ) ;
-
- checkTomcatResponse(tomcatResponse) ;
+ TomcatManagerResponse tomcatResponse =
+ getManager().deployContext( getPath(), contextURL, warURL, isUpdate(), getTag() );
+
+ checkTomcatResponse( tomcatResponse );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractDeployWarMojo.java Mon Sep 2 06:09:48 2013
@@ -82,8 +82,9 @@ public class AbstractDeployWarMojo
getLog().info( messagesProvider.getMessage( "AbstractDeployMojo.deployingWar", getDeployedURL() ) );
- TomcatManagerResponse tomcatResponse = getManager().deploy( getPath(), warFile, isUpdate(), getTag(), warFile.length() ) ;
-
- checkTomcatResponse(tomcatResponse) ;
+ TomcatManagerResponse tomcatResponse =
+ getManager().deploy( getPath(), warFile, isUpdate(), getTag(), warFile.length() );
+
+ checkTomcatResponse( tomcatResponse );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ListMojo.java Mon Sep 2 06:09:48 2013
@@ -48,10 +48,10 @@ public class ListMojo
{
getLog().info( messagesProvider.getMessage( "ListMojo.listApps", getURL() ) );
- TomcatManagerResponse tomcatResponse = getManager().list() ;
-
- checkTomcatResponse(tomcatResponse) ;
-
+ TomcatManagerResponse tomcatResponse = getManager().list();
+
+ checkTomcatResponse( tomcatResponse );
+
log( tomcatResponse.getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ReloadMojo.java Mon Sep 2 06:09:48 2013
@@ -48,13 +48,13 @@ public class ReloadMojo
{
getLog().info( messagesProvider.getMessage( "RedeployMojo.redeployApp", getDeployedURL() ) );
- TomcatManagerResponse tomcatResponse = getManager().reload( getPath() ) ;
+ TomcatManagerResponse tomcatResponse = getManager().reload( getPath() );
/* TODO : Tomcat always return http status 200. How check message to know error or not,
* cause is can be in french, english....
*/
- checkTomcatResponse(tomcatResponse) ;
-
+ checkTomcatResponse( tomcatResponse );
+
log( tomcatResponse.getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ResourcesMojo.java Mon Sep 2 06:09:48 2013
@@ -67,9 +67,9 @@ public class ResourcesMojo
}
TomcatManagerResponse tomcatResponse = getManager().getResources( type );
-
- checkTomcatResponse(tomcatResponse) ;
-
+
+ checkTomcatResponse( tomcatResponse );
+
log( tomcatResponse.getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RolesMojo.java Mon Sep 2 06:09:48 2013
@@ -52,9 +52,9 @@ public class RolesMojo
/* TODO : Tomcat always return http status 200. How check message to know error or not,
* cause is can be in french, english....
- */
- checkTomcatResponse(tomcatResponse) ;
-
+ */
+ checkTomcatResponse( tomcatResponse );
+
log( tomcatResponse.getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/ServerInfoMojo.java Mon Sep 2 06:09:48 2013
@@ -47,11 +47,11 @@ public class ServerInfoMojo
throws MojoExecutionException, TomcatManagerException, IOException
{
getLog().info( messagesProvider.getMessage( "ServerInfoMojo.listInfo", getURL() ) );
-
- TomcatManagerResponse tomcatResponse = getManager().getServerInfo() ;
-
- checkTomcatResponse(tomcatResponse) ;
-
+
+ TomcatManagerResponse tomcatResponse = getManager().getServerInfo();
+
+ checkTomcatResponse( tomcatResponse );
+
log( tomcatResponse.getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/SessionsMojo.java Mon Sep 2 06:09:48 2013
@@ -48,10 +48,10 @@ public class SessionsMojo
{
getLog().info( messagesProvider.getMessage( "SessionsMojo.listSessions", getDeployedURL() ) );
- TomcatManagerResponse tomcatResponse = getManager().getSessions( getPath() ) ;
-
- checkTomcatResponse(tomcatResponse) ;
-
+ TomcatManagerResponse tomcatResponse = getManager().getSessions( getPath() );
+
+ checkTomcatResponse( tomcatResponse );
+
log( tomcatResponse.getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StartMojo.java Mon Sep 2 06:09:48 2013
@@ -48,13 +48,13 @@ public class StartMojo
{
getLog().info( messagesProvider.getMessage( "StartMojo.startingApp", getDeployedURL() ) );
- TomcatManagerResponse tomcatResponse = getManager().start( getPath() ) ;
+ TomcatManagerResponse tomcatResponse = getManager().start( getPath() );
/* TODO : Tomcat always return http status 200. How check message to know error or not,
* cause is can be in french, english....
*/
- checkTomcatResponse(tomcatResponse) ;
-
+ checkTomcatResponse( tomcatResponse );
+
log( tomcatResponse.getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/StopMojo.java Mon Sep 2 06:09:48 2013
@@ -48,13 +48,13 @@ public class StopMojo
{
getLog().info( messagesProvider.getMessage( "StopMojo.stoppingApp", getDeployedURL() ) );
- TomcatManagerResponse tomcatResponse = getManager().stop( getPath() ) ;
+ TomcatManagerResponse tomcatResponse = getManager().stop( getPath() );
/* TODO : Tomcat always return http status 200. How check message to know error or not,
* cause is can be in french, english....
*/
- checkTomcatResponse(tomcatResponse) ;
-
- log( tomcatResponse.getHttpResponseBody() );
+ checkTomcatResponse( tomcatResponse );
+
+ log( tomcatResponse.getHttpResponseBody() );
}
}
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java?rev=1519351&r1=1519350&r2=1519351&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/UndeployMojo.java Mon Sep 2 06:09:48 2013
@@ -61,14 +61,14 @@ public class UndeployMojo
try
{
- TomcatManagerResponse tomcatResponse = getManager().undeploy( getPath() ) ;
+ TomcatManagerResponse tomcatResponse = getManager().undeploy( getPath() );
/* TODO : Tomcat always return http status 200. How check message to know error or not,
* cause is can be in french, english....
*/
- checkTomcatResponse(tomcatResponse) ;
-
- log( tomcatResponse.getHttpResponseBody() );
+ checkTomcatResponse( tomcatResponse );
+
+ log( tomcatResponse.getHttpResponseBody() );
}
catch ( TomcatManagerException exception )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org