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 IOException if 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 IOException if 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 IOException if 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 IOException if 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 IOException if 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 TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String deploy( String path, InputStream war, boolean update, String
tag )
+ public TomcatManagerResponse deploy( String path, InputStream war, boolean
update, String tag )
throws TomcatManagerException, IOException
{
return deployImpl( path, null, null, war, update, tag );
@@ -344,7 +344,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String deployContext( String path, URL config )
+ public TomcatManagerResponse deployContext( String path, URL config )
throws TomcatManagerException, IOException
{
return deployContext( path, config, false );
@@ -361,7 +361,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String deployContext( String path, URL config, boolean update )
+ public TomcatManagerResponse deployContext( String path, URL config,
boolean update )
throws TomcatManagerException, IOException
{
return deployContext( path, config, update, null );
@@ -379,7 +379,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String deployContext( String path, URL config, boolean update,
String tag )
+ public TomcatManagerResponse deployContext( String path, URL config,
boolean update, String tag )
throws TomcatManagerException, IOException
{
return deployContext( path, config, null, update, tag );
@@ -395,7 +395,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String deployContext( String path, URL config, URL war )
+ public TomcatManagerResponse deployContext( String path, URL config, URL
war )
throws TomcatManagerException, IOException
{
return deployContext( path, config, war, false );
@@ -413,7 +413,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String deployContext( String path, URL config, URL war, boolean
update )
+ public TomcatManagerResponse deployContext( String path, URL config, URL
war, boolean update )
throws TomcatManagerException, IOException
{
return deployContext( path, config, war, update, null );
@@ -432,7 +432,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String deployContext( String path, URL config, URL war, boolean
update, String tag )
+ public TomcatManagerResponse deployContext( String path, URL config, URL
war, boolean update, String tag )
throws TomcatManagerException, IOException
{
return deployImpl( path, config, war, null, update, tag );
@@ -446,7 +446,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String undeploy( String path )
+ public TomcatManagerResponse undeploy( String path )
throws TomcatManagerException, IOException
{
return invoke( "/undeploy?path=" + URLEncoder.encode( path, charset )
);
@@ -460,7 +460,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String reload( String path )
+ public TomcatManagerResponse reload( String path )
throws TomcatManagerException, IOException
{
return invoke( "/reload?path=" + URLEncoder.encode( path, charset ) );
@@ -474,7 +474,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String start( String path )
+ public TomcatManagerResponse start( String path )
throws TomcatManagerException, IOException
{
return invoke( "/start?path=" + URLEncoder.encode( path, charset ) );
@@ -488,7 +488,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String stop( String path )
+ public TomcatManagerResponse stop( String path )
throws TomcatManagerException, IOException
{
return invoke( "/stop?path=" + URLEncoder.encode( path, charset ) );
@@ -501,7 +501,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String list()
+ public TomcatManagerResponse list()
throws TomcatManagerException, IOException
{
return invoke( "/list" );
@@ -514,7 +514,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String getServerInfo()
+ public TomcatManagerResponse getServerInfo()
throws TomcatManagerException, IOException
{
return invoke( "/serverinfo" );
@@ -527,7 +527,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String getResources()
+ public TomcatManagerResponse getResources()
throws TomcatManagerException, IOException
{
return getResources( null );
@@ -541,7 +541,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String getResources( String type )
+ public TomcatManagerResponse getResources( String type )
throws TomcatManagerException, IOException
{
StringBuffer buffer = new StringBuffer();
@@ -561,7 +561,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String getRoles()
+ public TomcatManagerResponse getRoles()
throws TomcatManagerException, IOException
{
return invoke( "/roles" );
@@ -575,7 +575,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- public String getSessions( String path )
+ public TomcatManagerResponse getSessions( String path )
throws TomcatManagerException, IOException
{
return invoke( "/sessions?path=" + URLEncoder.encode( path, charset )
);
@@ -593,13 +593,12 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- protected String invoke( String path )
+ protected TomcatManagerResponse invoke( String path )
throws TomcatManagerException, IOException
{
return invoke( path, null );
}
-
// ----------------------------------------------------------------------
// Private Methods
// ----------------------------------------------------------------------
@@ -617,7 +616,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- private String deployImpl( String path, URL config, URL war, InputStream
data, boolean update, String tag )
+ private TomcatManagerResponse deployImpl( String path, URL config, URL
war, InputStream data, boolean update, String tag )
throws TomcatManagerException, IOException
{
StringBuilder buffer = new StringBuilder( "/deploy" );
@@ -647,7 +646,7 @@ public class TomcatManager
}
-/**
+ /**
* Invokes Tomcat manager with the specified command and content data.
*
* @param path the Tomcat manager command to invoke
@@ -656,7 +655,7 @@ public class TomcatManager
* @throws TomcatManagerException if the Tomcat manager request fails
* @throws IOException if an i/o error occurs
*/
- protected String invoke( String path, InputStream data )
+ protected TomcatManagerResponse invoke( String path, InputStream data )
throws TomcatManagerException, IOException
{
@@ -681,10 +680,12 @@ public class TomcatManager
}
HttpResponse response = httpClient.execute( httpRequestBase,
localContext );
- // FIXME take care of statuscode and reasonphase
- return IOUtils.toString( response.getEntity().getContent() );
- }
+ return new TomcatManagerResponse().setStatusCode(
response.getStatusLine().getStatusCode() ).setReasonPhrase(
+ response.getStatusLine().getReasonPhrase() ).setHttpResponseBody(
+ IOUtils.toString( response.getEntity().getContent() ) );
+
+ }
/**
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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -174,7 +174,7 @@ public abstract class AbstractDeployMojo
getLog().info( messagesProvider.getMessage(
"AbstractDeployMojo.deployingWar", getDeployedURL() ) );
URL warURL = getWarFile().toURL();
- log( getManager().deploy( getPath(), warURL, isUpdate(), getTag() ) );
+ log( getManager().deploy( getPath(), warURL, isUpdate(), getTag()
).getHttpResponseBody() );
}
/**
@@ -192,7 +192,7 @@ public abstract class AbstractDeployMojo
getLog().info( messagesProvider.getMessage(
"AbstractDeployMojo.deployingContext", getDeployedURL() ) );
URL contextURL = getContextFile().toURL();
- log( getManager().deployContext( getPath(), contextURL, isUpdate(),
getTag() ) );
+ log( getManager().deployContext( getPath(), contextURL, isUpdate(),
getTag() ).getHttpResponseBody() );
}
/**
@@ -212,6 +212,6 @@ public abstract class AbstractDeployMojo
URL warURL = getWarFile().toURL();
URL contextURL = getContextFile().toURL();
- log( getManager().deployContext( getPath(), contextURL, warURL,
isUpdate(), getTag() ) );
+ log( getManager().deployContext( getPath(), contextURL, warURL,
isUpdate(), getTag() ).getHttpResponseBody() );
}
}
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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -84,6 +84,7 @@ public class AbstractDeployWarMojo
getLog().info( messagesProvider.getMessage(
"AbstractDeployMojo.deployingWar", getDeployedURL() ) );
- log( getManager().deploy( getPath(), new FileInputStream( warFile ),
isUpdate(), getTag() ) );
+ log( getManager().deploy( getPath(), new FileInputStream( warFile ),
isUpdate(),
+ getTag() ).getHttpResponseBody() );
}
}
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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -47,6 +47,6 @@ public class ListMojo
{
getLog().info( messagesProvider.getMessage( "ListMojo.listApps",
getURL() ) );
- log( getManager().list() );
+ log( getManager().list().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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -47,6 +47,6 @@ public class ReloadMojo
{
getLog().info( messagesProvider.getMessage(
"RedeployMojo.redeployApp", getDeployedURL() ) );
- log( getManager().reload( getPath() ) );
+ log( getManager().reload( getPath() ).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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -65,6 +65,6 @@ public class ResourcesMojo
getLog().info( messagesProvider.getMessage(
"ResourcesMojo.listTypedResources", type, getURL() ) );
}
- log( getManager().getResources( type ) );
+ log( getManager().getResources( type ).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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -47,6 +47,6 @@ public class RolesMojo
{
getLog().info( messagesProvider.getMessage( "RolesMojo.listRoles",
getURL() ) );
- log( getManager().getRoles() );
+ log( getManager().getRoles().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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -47,6 +47,6 @@ public class ServerInfoMojo
{
getLog().info( messagesProvider.getMessage( "ServerInfoMojo.listInfo",
getURL() ) );
- log( getManager().getServerInfo() );
+ log( getManager().getServerInfo().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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -47,6 +47,6 @@ public class SessionsMojo
{
getLog().info( messagesProvider.getMessage(
"SessionsMojo.listSessions", getDeployedURL() ) );
- log( getManager().getSessions( getPath() ) );
+ log( getManager().getSessions( getPath() ).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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -47,6 +47,6 @@ public class StartMojo
{
getLog().info( messagesProvider.getMessage( "StartMojo.startingApp",
getDeployedURL() ) );
- log( getManager().start( getPath() ) );
+ log( getManager().start( getPath() ).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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -47,6 +47,6 @@ public class StopMojo
{
getLog().info( messagesProvider.getMessage( "StopMojo.stoppingApp",
getDeployedURL() ) );
- log( getManager().stop( getPath() ) );
+ log( getManager().stop( getPath() ).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=1212686&r1=1212685&r2=1212686&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
Fri Dec 9 23:33:05 2011
@@ -60,7 +60,7 @@ public class UndeployMojo
try
{
- log( getManager().undeploy( getPath() ) );
+ log( getManager().undeploy( getPath() ).getHttpResponseBody() );
}
catch ( TomcatManagerException exception )
{
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java?rev=1212686&r1=1212685&r2=1212686&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
Fri Dec 9 23:33:05 2011
@@ -179,7 +179,7 @@ public abstract class AbstractDeployMojo
getLog().info( messagesProvider.getMessage(
"AbstractDeployMojo.deployingWar", getDeployedURL() ) );
URL warURL = getWarFile().toURL();
- log( getManager().deploy( getPath(), warURL, isUpdate(), getTag() ) );
+ log( getManager().deploy( getPath(), warURL, isUpdate(), getTag()
).getHttpResponseBody() );
}
/**
@@ -199,7 +199,7 @@ public abstract class AbstractDeployMojo
getLog().info( messagesProvider.getMessage(
"AbstractDeployMojo.deployingContext", getDeployedURL() ) );
URL contextURL = getContextFile().toURL();
- log( getManager().deployContext( getPath(), contextURL, isUpdate(),
getTag() ) );
+ log( getManager().deployContext( getPath(), contextURL, isUpdate(),
getTag() ).getHttpResponseBody() );
}
/**
@@ -221,6 +221,6 @@ public abstract class AbstractDeployMojo
URL warURL = getWarFile().toURL();
URL contextURL = getContextFile().toURL();
- log( getManager().deployContext( getPath(), contextURL, warURL,
isUpdate(), getTag() ) );
+ log( getManager().deployContext( getPath(), contextURL, warURL,
isUpdate(), getTag() ).getHttpResponseBody() );
}
}
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java?rev=1212686&r1=1212685&r2=1212686&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployWarMojo.java
Fri Dec 9 23:33:05 2011
@@ -84,6 +84,7 @@ public class AbstractDeployWarMojo
getLog().info( messagesProvider.getMessage(
"AbstractDeployMojo.deployingWar", getDeployedURL() ) );
- log( getManager().deploy( getPath(), new FileInputStream( warFile ),
isUpdate(), getTag() ) );
+ log( getManager().deploy( getPath(), new FileInputStream( warFile ),
isUpdate(),
+ getTag() ).getHttpResponseBody() );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
