tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1178615 - in /tomcat/maven-plugin/trunk: ./ common-tomcat-maven-plugin/ common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/ common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/ common-tomca...
Date Mon, 03 Oct 2011 22:16:48 GMT
Author: olamy
Date: Mon Oct  3 22:16:47 2011
New Revision: 1178615

URL: http://svn.apache.org/viewvc?rev=1178615&view=rev
Log:
[MTOMCAT-62] tomcat7 support: start moving to a compostion model rather than inheritance to ease reuse of component in tomcat6 and 7 mojos

Added:
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java   (contents, props changed)
      - copied, changed from r1178614, tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/MessagesProvider.java
      - copied, changed from r1178614, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties   (contents, props changed)
      - copied, changed from r1178614, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/resources/org/apache/tomcat/maven/plugin/messages.properties
Removed:
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/resources/org/apache/tomcat/maven/plugin/messages.properties
Modified:
    tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
    tomcat/maven-plugin/trunk/pom.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployWarMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NTomcat6Mojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractWarCatalinaMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExplodedMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/InplaceMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ListMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ResourcesMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RolesMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ServerInfoMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/SessionsMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ShutdownMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StartMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StopMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/UndeployMojo.java
    tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/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=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Mon Oct  3 22:16:47 2011
@@ -15,6 +15,30 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <version>1.5.5</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+        <executions>
+          <execution>
+            <id>process-classes</id>
+            <goals>
+              <goal>generate-metadata</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+
+  </build>
+
 </project>

Copied: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java (from r1178614, tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java?p2=tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java&p1=tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java&r1=1178614&r2=1178615&rev=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/AbstractI18NTomcatMojo.java (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java Mon Oct  3 22:16:47 2011
@@ -1,5 +1,4 @@
-package org.apache.tomcat.maven.common;
-
+package org.apache.tomcat.maven.common.messages;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,48 +18,39 @@ package org.apache.tomcat.maven.common;
  * under the License.
  */
 
-import org.apache.maven.plugin.AbstractMojo;
+import org.codehaus.plexus.component.annotations.Component;
 
 import java.text.MessageFormat;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 /**
- * Abstract goal that provides i18n support.
- *
- * @author Mark Hobson <markhobson@gmail.com>
- * @version $Id: AbstractI18NMojo.java 12852 2010-10-12 22:04:32Z thragor $
+ * @author Olivier Lamy
+ * @component role="org.apache.tomcat.maven.common.messages.MessagesProvider" role-hint="default"
+ * @since 2.0
  */
-public abstract class AbstractI18NTomcatMojo
-    extends AbstractMojo
+@Component( role = MessagesProvider.class )
+public class DefaultMessagesProvider
+    implements MessagesProvider
 {
 
-    // ----------------------------------------------------------------------
-    // Fields
-    // ----------------------------------------------------------------------
-
     /**
-     * The plugin messages.
+     * plugin messages
      */
     private ResourceBundle messages;
 
-    // ----------------------------------------------------------------------
-    // Constructors
-    // ----------------------------------------------------------------------
 
-    /**
-     * Creates a new <code>AbstractI18NMojo</code>.
-     */
-    public AbstractI18NTomcatMojo( )
+    public DefaultMessagesProvider( )
     {
         String packageName = getClass( ).getPackage( ).getName( );
 
         messages = ResourceBundle.getBundle( packageName + ".messages" );
     }
 
-    // ----------------------------------------------------------------------
-    // Protected Methods
-    // ----------------------------------------------------------------------
+    public ResourceBundle getResourceBundle( )
+    {
+        return this.messages;
+    }
 
     /**
      * Gets the message for the given key from this packages resource bundle.
@@ -68,11 +58,11 @@ public abstract class AbstractI18NTomcat
      * @param key the key for the required message
      * @return the message
      */
-    protected String getMessage( String key )
+    public String getMessage( String key )
     {
         try
         {
-            return messages.getString( key );
+            return getResourceBundle( ).getString( key );
         }
         catch ( NullPointerException exception )
         {
@@ -95,7 +85,7 @@ public abstract class AbstractI18NTomcat
      * @param param the parameter to be used to format the message with
      * @return the formatted message
      */
-    protected String getMessage( String key, Object param )
+    public String getMessage( String key, Object param )
     {
         return MessageFormat.format( getMessage( key ), new Object[]{ param } );
     }
@@ -108,7 +98,7 @@ public abstract class AbstractI18NTomcat
      * @param param2 the second parameter to be used to format the message with
      * @return the formatted message
      */
-    protected String getMessage( String key, Object param1, Object param2 )
+    public String getMessage( String key, Object param1, Object param2 )
     {
         return MessageFormat.format( getMessage( key ), new Object[]{ param1, param2 } );
     }
@@ -120,10 +110,8 @@ public abstract class AbstractI18NTomcat
      * @param params the parameters to be used to format the message with
      * @return the formatted message
      */
-    protected String getMessage( String key, Object[] params )
+    public String getMessage( String key, Object[] params )
     {
         return MessageFormat.format( getMessage( key ), params );
     }
-
-    protected abstract String getPath();
 }

Propchange: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Copied: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/MessagesProvider.java (from r1178614, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/MessagesProvider.java?p2=tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/MessagesProvider.java&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java&r1=1178614&r2=1178615&rev=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/MessagesProvider.java Mon Oct  3 22:16:47 2011
@@ -1,5 +1,4 @@
-package org.apache.tomcat.maven.plugin;
-
+package org.apache.tomcat.maven.common.messages;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -19,33 +18,19 @@ package org.apache.tomcat.maven.plugin;
  * under the License.
  */
 
-import org.apache.maven.plugin.MojoExecutionException;
-
-import java.io.IOException;
-
 /**
- * Reload a WAR in Tomcat.
- * 
- * @goal reload
- * @author olamy
- * @version $Id: ReloadMojo.java 12852 2010-10-12 22:04:32Z thragor $
+ * messages provider
+ *
+ * @author Olivier Lamy
+ * @since 2.0
  */
-public class ReloadMojo
-    extends AbstractWarCatalinaMojo
+public interface MessagesProvider
 {
-    // ----------------------------------------------------------------------
-    // Protected Methods
-    // ----------------------------------------------------------------------
+    String getMessage( String key );
+
+    String getMessage( String key, Object param );
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void invokeManager()
-        throws MojoExecutionException, TomcatManagerException, IOException
-    {
-        getLog().info( getMessage( "RedeployMojo.redeployApp", getDeployedURL() ) );
+    String getMessage( String key, Object param1, Object param2 );
 
-        log( getManager().reload( getPath() ) );
-    }
+    String getMessage( String key, Object[] params );
 }

Copied: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties (from r1178614, tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/resources/org/apache/tomcat/maven/plugin/messages.properties)
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties?p2=tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties&p1=tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/resources/org/apache/tomcat/maven/plugin/messages.properties&r1=1178614&r2=1178615&rev=1178615&view=diff
==============================================================================
    (empty)

Propchange: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/resources/org/apache/tomcat/maven/common/messages/messages.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: tomcat/maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Oct  3 22:16:47 2011
@@ -369,14 +369,7 @@
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-metadata</artifactId>
-          <version>1.5.1</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>generate-metadata</goal>
-              </goals>
-            </execution>
-          </executions>
+          <version>1.5.5</version>
         </plugin>
       </plugins>
     </pluginManagement>

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=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Mon Oct  3 22:16:47 2011
@@ -175,7 +175,6 @@
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-component-metadata</artifactId>
-        <version>1.5.1</version>
         <executions>
           <execution>
             <goals>

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractCatalinaMojo.java Mon Oct  3 22:16:47 2011
@@ -19,20 +19,19 @@ package org.apache.tomcat.maven.plugin;
  * under the License.
  */
 
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.StringTokenizer;
-
 import org.apache.maven.artifact.manager.WagonManager;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.wagon.authentication.AuthenticationInfo;
-import org.apache.tomcat.maven.common.AbstractI18NTomcatMojo;
 import org.codehaus.plexus.util.StringUtils;
 
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.StringTokenizer;
+
 /**
  * Abstract goal that provides common configuration for Catalina-based goals.
- * 
+ *
  * @author Mark Hobson <markhobson@gmail.com>
  * @version $Id: AbstractCatalinaMojo.java 12852 2010-10-12 22:04:32Z thragor $
  */
@@ -64,7 +63,7 @@ public abstract class AbstractCatalinaMo
 
     /**
      * The Maven Wagon manager to use when obtaining server authentication details.
-     * 
+     *
      * @component role="org.apache.maven.artifact.manager.WagonManager"
      * @required
      * @readonly
@@ -73,7 +72,7 @@ public abstract class AbstractCatalinaMo
 
     /**
      * The full URL of the Tomcat manager instance to use.
-     * 
+     *
      * @parameter expression="${maven.tomcat.url}" default-value="http://localhost:8080/manager"
      * @required
      */
@@ -82,14 +81,14 @@ public abstract class AbstractCatalinaMo
     /**
      * The server id in settings.xml to use when authenticating with Tomcat manager, or <code>null</code> to use
      * defaults of username <code>admin</code> and no password.
-     * 
+     *
      * @parameter expression="${maven.tomcat.server}"
      */
     private String server;
 
     /**
      * The URL encoding charset to use when communicating with Tomcat manager.
-     * 
+     *
      * @parameter expression="${maven.tomcat.charset}" default-value="ISO-8859-1"
      * @required
      */
@@ -97,7 +96,7 @@ public abstract class AbstractCatalinaMo
 
     /**
      * The tomcat username to use for deployment
-     * 
+     *
      * @parameter expression="${tomcat.username}"
      * @since 1.0-alpha-2
      */
@@ -105,7 +104,7 @@ public abstract class AbstractCatalinaMo
 
     /**
      * The password to use for deployment
-     * 
+     *
      * @parameter expression="${tomcat.password}"
      * @since 1.0-alpha-2
      */
@@ -134,20 +133,22 @@ public abstract class AbstractCatalinaMo
     /**
      * {@inheritDoc}
      */
-    public void execute()
+    public void execute( )
         throws MojoExecutionException
     {
         try
         {
-            invokeManager();
+            invokeManager( );
         }
         catch ( TomcatManagerException exception )
         {
-            throw new MojoExecutionException( getMessage( "AbstractCatalinaMojo.managerError", exception.getMessage() ) );
+            throw new MojoExecutionException(
+                messagesProvider.getMessage( "AbstractCatalinaMojo.managerError", exception.getMessage( ) ) );
         }
         catch ( IOException exception )
         {
-            throw new MojoExecutionException( getMessage( "AbstractCatalinaMojo.managerIOError" ), exception );
+            throw new MojoExecutionException( messagesProvider.getMessage( "AbstractCatalinaMojo.managerIOError" ),
+                                              exception );
         }
     }
 
@@ -157,21 +158,21 @@ public abstract class AbstractCatalinaMo
 
     /**
      * Invokes Tomcat manager when this Mojo is executed.
-     * 
+     *
      * @throws MojoExecutionException if there was a problem executing this goal
      * @throws TomcatManagerException if the Tomcat manager request fails
-     * @throws IOException if an i/o error occurs
+     * @throws IOException            if an i/o error occurs
      */
-    protected abstract void invokeManager()
+    protected abstract void invokeManager( )
         throws MojoExecutionException, TomcatManagerException, IOException;
 
     /**
      * Gets the Tomcat manager wrapper object configured for this goal.
-     * 
+     *
      * @return the Tomcat manager wrapper object
      * @throws MojoExecutionException if there was a problem obtaining the authentication details
      */
-    protected TomcatManager getManager()
+    protected TomcatManager getManager( )
         throws MojoExecutionException
     {
         // lazily instantiate when config values have been injected
@@ -183,7 +184,7 @@ public abstract class AbstractCatalinaMo
             if ( server == null )
             {
                 // no server set, use defaults
-                getLog().debug( getMessage( "AbstractCatalinaMojo.defaultAuth" ) );
+                getLog( ).debug( messagesProvider.getMessage( "AbstractCatalinaMojo.defaultAuth" ) );
                 userName = DEFAULT_USERNAME;
                 password = DEFAULT_PASSWORD;
             }
@@ -193,22 +194,23 @@ public abstract class AbstractCatalinaMo
                 AuthenticationInfo info = wagonManager.getAuthenticationInfo( server );
                 if ( info == null )
                 {
-                    throw new MojoExecutionException( getMessage( "AbstractCatalinaMojo.unknownServer", server ) );
+                    throw new MojoExecutionException(
+                        messagesProvider.getMessage( "AbstractCatalinaMojo.unknownServer", server ) );
                 }
 
                 // derive username
-                userName = info.getUserName();
+                userName = info.getUserName( );
                 if ( userName == null )
                 {
-                    getLog().debug( getMessage( "AbstractCatalinaMojo.defaultUserName" ) );
+                    getLog( ).debug( messagesProvider.getMessage( "AbstractCatalinaMojo.defaultUserName" ) );
                     userName = DEFAULT_USERNAME;
                 }
 
                 // derive password
-                password = info.getPassword();
+                password = info.getPassword( );
                 if ( password == null )
                 {
-                    getLog().debug( getMessage( "AbstractCatalinaMojo.defaultPassword" ) );
+                    getLog( ).debug( messagesProvider.getMessage( "AbstractCatalinaMojo.defaultPassword" ) );
                     password = DEFAULT_PASSWORD;
                 }
             }
@@ -229,48 +231,48 @@ public abstract class AbstractCatalinaMo
 
     /**
      * Gets the full URL of the Tomcat manager instance.
-     * 
+     *
      * @return the full URL of the Tomcat manager instance to use
      */
-    protected URL getURL()
+    protected URL getURL( )
     {
         return url;
     }
 
     /**
      * Gets the webapp context path to use when communicating with Tomcat manager.
-     * 
+     *
      * @return the webapp context path to use
      */
-    protected String getPath()
+    protected String getPath( )
     {
         return path;
     }
 
     /**
      * Gets the URL of the deployed webapp.
-     * 
+     *
      * @return the URL of the deployed webapp
      * @throws MalformedURLException if the deployed webapp URL is invalid
      */
-    protected URL getDeployedURL()
+    protected URL getDeployedURL( )
         throws MalformedURLException
     {
-        return new URL( getURL(), getPath() );
+        return new URL( getURL( ), getPath( ) );
     }
 
     /**
      * Splits the given string into lines and writes each one separately to the log at info level.
-     * 
+     *
      * @param string the string to write
      */
     protected void log( String string )
     {
         StringTokenizer tokenizer = new StringTokenizer( string, "\n\r" );
 
-        while ( tokenizer.hasMoreTokens() )
+        while ( tokenizer.hasMoreTokens( ) )
         {
-            getLog().info( tokenizer.nextToken() );
+            getLog( ).info( tokenizer.nextToken( ) );
         }
     }
 }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployMojo.java Mon Oct  3 22:16:47 2011
@@ -19,15 +19,15 @@ package org.apache.tomcat.maven.plugin;
  * under the License.
  */
 
+import org.apache.maven.plugin.MojoExecutionException;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
 
-import org.apache.maven.plugin.MojoExecutionException;
-
 /**
  * Deploy a WAR to Tomcat.
- * 
+ *
  * @author Mark Hobson <markhobson@gmail.com>
  * @version $Id: AbstractDeployMojo.java 12852 2010-10-12 22:04:32Z thragor $
  */
@@ -41,7 +41,7 @@ public abstract class AbstractDeployMojo
     /**
      * The deployment mode to use. This must be either <code>war</code> to deploy the war, <code>context</code> to
      * deploy the context XML file, or <code>both</code> to deploy the war with the context XML file.
-     * 
+     *
      * @parameter expression = "${maven.tomcat.mode}" default-value = "war"
      * @required
      */
@@ -49,14 +49,14 @@ public abstract class AbstractDeployMojo
 
     /**
      * The path of the Tomcat context XML file. This is not used for war deployment mode.
-     * 
+     *
      * @parameter expression = "${project.build.directory}/${project.build.finalName}/META-INF/context.xml"
      */
     private File contextFile;
 
     /**
      * Whether Tomcat should automatically undeploy webapps that already exist when deploying.
-     * 
+     *
      * @parameter expression = "${maven.tomcat.update}" default-value = "false"
      * @required
      */
@@ -64,7 +64,7 @@ public abstract class AbstractDeployMojo
 
     /**
      * The Tomcat webapp tag name to use.
-     * 
+     *
      * @parameter expression = "${maven.tomcat.tag}"
      */
     private String tag;
@@ -77,139 +77,140 @@ public abstract class AbstractDeployMojo
      * {@inheritDoc}
      */
     @Override
-    public void invokeManager()
+    public void invokeManager( )
         throws MojoExecutionException, TomcatManagerException, IOException
     {
         if ( "war".equals( mode ) )
         {
-            deployWar();
+            deployWar( );
         }
         else if ( "context".equals( mode ) )
         {
-            deployContext();
+            deployContext( );
         }
         else if ( "both".equals( mode ) )
         {
-            deployWarAndContext();
+            deployWarAndContext( );
         }
         else
         {
-            throw new MojoExecutionException( getMessage( "AbstractDeployMojo.unknownMode", mode ) );
+            throw new MojoExecutionException( messagesProvider.getMessage( "AbstractDeployMojo.unknownMode", mode ) );
         }
     }
 
     /**
      * Gets the Tomcat WAR file. This may be a file or a directory depending on the deployment mode.
-     * 
+     *
      * @return the Tomcat WAR file.
      */
-    protected abstract File getWarFile();
+    protected abstract File getWarFile( );
 
     /**
      * Ensures that the Tomcat WAR file exists and is the correct type for the deployment mode.
-     * 
+     *
      * @throws MojoExecutionException if the WAR file does not exist or is not the correct type for the deployment mode
      */
-    protected abstract void validateWarFile()
+    protected abstract void validateWarFile( )
         throws MojoExecutionException;
 
     /**
      * Gets the Tomcat context XML file.
-     * 
+     *
      * @return the Tomcat context XML file.
      */
-    protected File getContextFile()
+    protected File getContextFile( )
     {
         return contextFile;
     }
 
     /**
      * Ensures that the Tomcat context XML file exists and is indeed a file.
-     * 
+     *
      * @throws MojoExecutionException if the context file does not exist or is not a file
      */
-    protected void validateContextFile()
+    protected void validateContextFile( )
         throws MojoExecutionException
     {
-        if ( !contextFile.exists() || !contextFile.isFile() )
+        if ( !contextFile.exists( ) || !contextFile.isFile( ) )
         {
-            throw new MojoExecutionException( getMessage( "AbstractDeployMojo.missingContext", contextFile.getPath() ) );
+            throw new MojoExecutionException(
+                messagesProvider.getMessage( "AbstractDeployMojo.missingContext", contextFile.getPath( ) ) );
         }
     }
 
     /**
      * Gets whether Tomcat should automatically undeploy webapps that already exist when deploying.
-     * 
+     *
      * @return whether Tomcat should automatically undeploy webapps that already exist when deploying
      */
-    protected boolean isUpdate()
+    protected boolean isUpdate( )
     {
         return update;
     }
 
     /**
      * Gets the Tomcat webapp tag name to use.
-     * 
+     *
      * @return the Tomcat webapp tag name to use
      */
-    protected String getTag()
+    protected String getTag( )
     {
         return tag;
     }
 
     /**
      * Deploys the WAR to Tomcat.
-     * 
+     *
      * @throws MojoExecutionException if there was a problem locating the WAR
      * @throws TomcatManagerException if the Tomcat manager request fails
-     * @throws IOException if an i/o error occurs
+     * @throws IOException            if an i/o error occurs
      */
-    protected void deployWar()
+    protected void deployWar( )
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        validateWarFile();
+        validateWarFile( );
 
-        getLog().info( getMessage( "AbstractDeployMojo.deployingWar", getDeployedURL() ) );
+        getLog( ).info( messagesProvider.getMessage( "AbstractDeployMojo.deployingWar", getDeployedURL( ) ) );
 
-        URL warURL = getWarFile().toURL();
-        log( getManager().deploy( getPath(), warURL, isUpdate(), getTag() ) );
+        URL warURL = getWarFile( ).toURL( );
+        log( getManager( ).deploy( getPath( ), warURL, isUpdate( ), getTag( ) ) );
     }
 
     /**
      * Deploys the context XML file to Tomcat.
-     * 
+     *
      * @throws MojoExecutionException if there was a problem locating the context XML file
      * @throws TomcatManagerException if the Tomcat manager request fails
-     * @throws IOException if an i/o error occurs
+     * @throws IOException            if an i/o error occurs
      */
-    protected void deployContext()
+    protected void deployContext( )
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        validateContextFile();
+        validateContextFile( );
 
-        getLog().info( getMessage( "AbstractDeployMojo.deployingContext", getDeployedURL() ) );
+        getLog( ).info( messagesProvider.getMessage( "AbstractDeployMojo.deployingContext", getDeployedURL( ) ) );
 
-        URL contextURL = getContextFile().toURL();
-        log( getManager().deployContext( getPath(), contextURL, isUpdate(), getTag() ) );
+        URL contextURL = getContextFile( ).toURL( );
+        log( getManager( ).deployContext( getPath( ), contextURL, isUpdate( ), getTag( ) ) );
     }
 
     /**
      * Deploys the WAR and context XML file to Tomcat.
-     * 
+     *
      * @throws MojoExecutionException if there was a problem locating either the WAR or the context XML file
      * @throws TomcatManagerException if the Tomcat manager request fails
-     * @throws IOException if an i/o error occurs
+     * @throws IOException            if an i/o error occurs
      */
-    protected void deployWarAndContext()
+    protected void deployWarAndContext( )
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        validateWarFile();
-        validateContextFile();
+        validateWarFile( );
+        validateContextFile( );
 
-        getLog().info( getMessage( "AbstractDeployMojo.deployingWarContext", getDeployedURL() ) );
+        getLog( ).info( messagesProvider.getMessage( "AbstractDeployMojo.deployingWarContext", getDeployedURL( ) ) );
 
-        URL warURL = getWarFile().toURL();
-        URL contextURL = getContextFile().toURL();
-        log( getManager().deployContext( getPath(), contextURL, warURL, isUpdate(), getTag() ) );
+        URL warURL = getWarFile( ).toURL( );
+        URL contextURL = getContextFile( ).toURL( );
+        log( getManager( ).deployContext( getPath( ), contextURL, warURL, isUpdate( ), getTag( ) ) );
     }
 }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployWarMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployWarMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployWarMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractDeployWarMojo.java Mon Oct  3 22:16:47 2011
@@ -19,12 +19,12 @@ package org.apache.tomcat.maven.plugin;
  * under the License.
  */
 
+import org.apache.maven.plugin.MojoExecutionException;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import org.apache.maven.plugin.MojoExecutionException;
-
 /**
  * @author olamy
  * @version $Id: AbstractDeployWarMojo.java 12852 2010-10-12 22:04:32Z thragor $
@@ -39,7 +39,7 @@ public class AbstractDeployWarMojo
 
     /**
      * The path of the WAR file to deploy.
-     * 
+     *
      * @parameter expression = "${project.build.directory}/${project.build.finalName}.war"
      * @required
      */
@@ -53,7 +53,7 @@ public class AbstractDeployWarMojo
      * {@inheritDoc}
      */
     @Override
-    protected File getWarFile()
+    protected File getWarFile( )
     {
         return warFile;
     }
@@ -62,12 +62,13 @@ public class AbstractDeployWarMojo
      * {@inheritDoc}
      */
     @Override
-    protected void validateWarFile()
+    protected void validateWarFile( )
         throws MojoExecutionException
     {
-        if ( !warFile.exists() || !warFile.isFile() )
+        if ( !warFile.exists( ) || !warFile.isFile( ) )
         {
-            throw new MojoExecutionException( getMessage( "DeployMojo.missingWar", warFile.getPath() ) );
+            throw new MojoExecutionException(
+                messagesProvider.getMessage( "DeployMojo.missingWar", warFile.getPath( ) ) );
         }
     }
 
@@ -75,13 +76,13 @@ public class AbstractDeployWarMojo
      * {@inheritDoc}
      */
     @Override
-    protected void deployWar()
+    protected void deployWar( )
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        validateWarFile();
+        validateWarFile( );
 
-        getLog().info( getMessage( "AbstractDeployMojo.deployingWar", getDeployedURL() ) );
+        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( ) ) );
     }
 }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NTomcat6Mojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NTomcat6Mojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NTomcat6Mojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractI18NTomcat6Mojo.java Mon Oct  3 22:16:47 2011
@@ -18,16 +18,24 @@ package org.apache.tomcat.maven.plugin;
  * under the License.
  */
 
-import org.apache.tomcat.maven.common.AbstractI18NTomcatMojo;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.tomcat.maven.common.messages.MessagesProvider;
 
 /**
  * olamy: as long as maven plugin descriptor metadata generation doesn't support annotations outside of the same
  * project, we must have those fields here
+ *
  * @author Olivier Lamy
  */
 public abstract class AbstractI18NTomcat6Mojo
-    extends AbstractI18NTomcatMojo
+    extends AbstractMojo
 {
+
+    /**
+     * @component
+     */
+    protected MessagesProvider messagesProvider;
+
     // ----------------------------------------------------------------------
     // Mojo Parameters
     // ----------------------------------------------------------------------
@@ -41,7 +49,7 @@ public abstract class AbstractI18NTomcat
      */
     protected String path;
 
-    @Override
+
     protected String getPath( )
     {
         return path;

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractRunMojo.java Mon Oct  3 22:16:47 2011
@@ -34,7 +34,6 @@ import org.apache.maven.artifact.resolve
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
-import org.apache.tomcat.maven.common.AbstractI18NTomcatMojo;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.UnArchiver;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -315,44 +314,45 @@ public abstract class AbstractRunMojo
     /**
      * {@inheritDoc}
      */
-    public void execute()
+    public void execute( )
         throws MojoExecutionException, MojoFailureException
     {
         // ensure project is a web application
-        if ( !isWar() )
+        if ( !isWar( ) )
         {
-            getLog().info( getMessage( "AbstractRunMojo.nonWar" ) );
+            getLog( ).info( messagesProvider.getMessage( "AbstractRunMojo.nonWar" ) );
             return;
         }
-        ClassLoader originalClassLoaser = Thread.currentThread().getContextClassLoader();
+        ClassLoader originalClassLoaser = Thread.currentThread( ).getContextClassLoader( );
         try
         {
             if ( useSeparateTomcatClassLoader )
             {
-                Thread.currentThread().setContextClassLoader( getTomcatClassLoader() );
+                Thread.currentThread( ).setContextClassLoader( getTomcatClassLoader( ) );
             }
-            getLog().info( getMessage( "AbstractRunMojo.runningWar", getWebappUrl() ) );
+            getLog( ).info( messagesProvider.getMessage( "AbstractRunMojo.runningWar", getWebappUrl( ) ) );
 
-            initConfiguration();
-            startContainer();
+            initConfiguration( );
+            startContainer( );
             if ( !fork )
             {
-                waitIndefinitely();
+                waitIndefinitely( );
             }
         }
         catch ( LifecycleException exception )
         {
-            throw new MojoExecutionException( getMessage( "AbstractRunMojo.cannotStart" ), exception );
+            throw new MojoExecutionException( messagesProvider.getMessage( "AbstractRunMojo.cannotStart" ), exception );
         }
         catch ( IOException exception )
         {
-            throw new MojoExecutionException( getMessage( "AbstractRunMojo.cannotCreateConfiguration" ), exception );
+            throw new MojoExecutionException(
+                messagesProvider.getMessage( "AbstractRunMojo.cannotCreateConfiguration" ), exception );
         }
         finally
         {
             if ( useSeparateTomcatClassLoader )
             {
-                Thread.currentThread().setContextClassLoader( originalClassLoaser );
+                Thread.currentThread( ).setContextClassLoader( originalClassLoaser );
             }
         }
     }
@@ -366,7 +366,7 @@ public abstract class AbstractRunMojo
      *
      * @return the webapp context path
      */
-    protected String getPath()
+    protected String getPath( )
     {
         return path;
     }
@@ -382,20 +382,20 @@ public abstract class AbstractRunMojo
     protected Context createContext( Embedded container )
         throws IOException, MojoExecutionException
     {
-        String contextPath = getPath();
+        String contextPath = getPath( );
         Context context =
-            container.createContext( "/".equals( contextPath ) ? "" : contextPath, getDocBase().getAbsolutePath() );
+            container.createContext( "/".equals( contextPath ) ? "" : contextPath, getDocBase( ).getAbsolutePath( ) );
 
         if ( useSeparateTomcatClassLoader )
         {
-            context.setParentClassLoader( getTomcatClassLoader() );
+            context.setParentClassLoader( getTomcatClassLoader( ) );
         }
 
-        context.setLoader( createWebappLoader() );
-        File contextFile = getContextFile();
+        context.setLoader( createWebappLoader( ) );
+        File contextFile = getContextFile( );
         if ( contextFile != null )
         {
-            context.setConfigFile( getContextFile().getAbsolutePath() );
+            context.setConfigFile( getContextFile( ).getAbsolutePath( ) );
         }
         return context;
     }
@@ -407,19 +407,20 @@ public abstract class AbstractRunMojo
      * @throws IOException            if the webapp loader could not be created
      * @throws MojoExecutionException in case of an error creating the webapp loader
      */
-    protected WebappLoader createWebappLoader()
+    protected WebappLoader createWebappLoader( )
         throws IOException, MojoExecutionException
     {
         if ( useSeparateTomcatClassLoader )
         {
-            return ( isContextReloadable() )
-                ? new ExternalRepositoriesReloadableWebappLoader( getTomcatClassLoader(), getLog() )
-                : new WebappLoader( getTomcatClassLoader() );
+            return ( isContextReloadable( ) )
+                ? new ExternalRepositoriesReloadableWebappLoader( getTomcatClassLoader( ), getLog( ) )
+                : new WebappLoader( getTomcatClassLoader( ) );
         }
 
-        return ( isContextReloadable() )
-            ? new ExternalRepositoriesReloadableWebappLoader( Thread.currentThread().getContextClassLoader(), getLog() )
-            : new WebappLoader( Thread.currentThread().getContextClassLoader() );
+        return ( isContextReloadable( ) )
+            ? new ExternalRepositoriesReloadableWebappLoader( Thread.currentThread( ).getContextClassLoader( ),
+                                                              getLog( ) )
+            : new WebappLoader( Thread.currentThread( ).getContextClassLoader( ) );
     }
 
     /**
@@ -427,7 +428,7 @@ public abstract class AbstractRunMojo
      *
      * @return false by default, true if  reloadable="true" in context.xml.
      */
-    protected boolean isContextReloadable()
+    protected boolean isContextReloadable( )
         throws MojoExecutionException
     {
         if ( contextReloadable )
@@ -438,32 +439,32 @@ public abstract class AbstractRunMojo
         boolean reloadable = false;
         try
         {
-            if ( contextFile != null && contextFile.exists() )
+            if ( contextFile != null && contextFile.exists( ) )
             {
-                DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance();
-                DocumentBuilder builder = builderFactory.newDocumentBuilder();
+                DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance( );
+                DocumentBuilder builder = builderFactory.newDocumentBuilder( );
                 Document contextDoc = builder.parse( contextFile );
-                contextDoc.getDocumentElement().normalize();
+                contextDoc.getDocumentElement( ).normalize( );
 
-                NamedNodeMap nodeMap = contextDoc.getDocumentElement().getAttributes();
+                NamedNodeMap nodeMap = contextDoc.getDocumentElement( ).getAttributes( );
                 Node reloadableAttribute = nodeMap.getNamedItem( "reloadable" );
 
                 reloadable =
-                    ( reloadableAttribute != null ) ? Boolean.valueOf( reloadableAttribute.getNodeValue() ) : false;
+                    ( reloadableAttribute != null ) ? Boolean.valueOf( reloadableAttribute.getNodeValue( ) ) : false;
             }
-            getLog().debug( "context reloadable: " + reloadable );
+            getLog( ).debug( "context reloadable: " + reloadable );
         }
         catch ( IOException ioe )
         {
-            getLog().error( "Could not parse file: [" + contextFile.getAbsolutePath() + "]", ioe );
+            getLog( ).error( "Could not parse file: [" + contextFile.getAbsolutePath( ) + "]", ioe );
         }
         catch ( ParserConfigurationException pce )
         {
-            getLog().error( "Could not configure XML parser", pce );
+            getLog( ).error( "Could not configure XML parser", pce );
         }
         catch ( SAXException se )
         {
-            getLog().error( "Could not parse file: [" + contextFile.getAbsolutePath() + "]", se );
+            getLog( ).error( "Could not parse file: [" + contextFile.getAbsolutePath( ) + "]", se );
         }
 
         return reloadable;
@@ -475,14 +476,14 @@ public abstract class AbstractRunMojo
      *
      * @return the webapp directory
      */
-    protected abstract File getDocBase();
+    protected abstract File getDocBase( );
 
     /**
      * Gets the Tomcat context XML file to use.
      *
      * @return the context XML file
      */
-    protected abstract File getContextFile()
+    protected abstract File getContextFile( )
         throws MojoExecutionException;
 
     // ----------------------------------------------------------------------
@@ -494,7 +495,7 @@ public abstract class AbstractRunMojo
      *
      * @return whether this project uses WAR packaging
      */
-    protected boolean isWar()
+    protected boolean isWar( )
     {
         return "war".equals( packaging ) || ignorePackaging;
     }
@@ -505,10 +506,10 @@ public abstract class AbstractRunMojo
      * @return the URL of the running webapp
      * @throws MalformedURLException if the running webapp URL is invalid
      */
-    private URL getWebappUrl()
+    private URL getWebappUrl( )
         throws MalformedURLException
     {
-        return new URL( "http", "localhost", port, getPath() );
+        return new URL( "http", "localhost", port, getPath( ) );
     }
 
     /**
@@ -517,28 +518,28 @@ public abstract class AbstractRunMojo
      * @throws IOException            if the Tomcat configuration could not be created
      * @throws MojoExecutionException if the Tomcat configuration could not be created
      */
-    private void initConfiguration()
+    private void initConfiguration( )
         throws IOException, MojoExecutionException
     {
-        if ( configurationDir.exists() )
+        if ( configurationDir.exists( ) )
         {
-            getLog().info( getMessage( "AbstractRunMojo.usingConfiguration", configurationDir ) );
+            getLog( ).info( messagesProvider.getMessage( "AbstractRunMojo.usingConfiguration", configurationDir ) );
         }
         else
         {
-            getLog().info( getMessage( "AbstractRunMojo.creatingConfiguration", configurationDir ) );
+            getLog( ).info( messagesProvider.getMessage( "AbstractRunMojo.creatingConfiguration", configurationDir ) );
 
-            configurationDir.mkdirs();
+            configurationDir.mkdirs( );
 
             File confDir = new File( configurationDir, "conf" );
-            confDir.mkdir();
+            confDir.mkdir( );
 
             copyFile( "/conf/tomcat-users.xml", new File( confDir, "tomcat-users.xml" ) );
             if ( tomcatWebXml != null )
             {
-                if ( !tomcatWebXml.exists() )
+                if ( !tomcatWebXml.exists( ) )
                 {
-                    throw new MojoExecutionException( " tomcatWebXml " + tomcatWebXml.getPath() + " not exists" );
+                    throw new MojoExecutionException( " tomcatWebXml " + tomcatWebXml.getPath( ) + " not exists" );
                 }
                 //MTOMCAT-42  here it's a real file resources not a one coming with the mojo 
                 FileUtils.copyFile( tomcatWebXml, new File( confDir, "web.xml" ) );
@@ -550,29 +551,29 @@ public abstract class AbstractRunMojo
             }
 
             File logDir = new File( configurationDir, "logs" );
-            logDir.mkdir();
+            logDir.mkdir( );
 
             File webappsDir = new File( configurationDir, "webapps" );
-            webappsDir.mkdir();
+            webappsDir.mkdir( );
 
-            if ( additionalConfigFilesDir != null && additionalConfigFilesDir.exists() )
+            if ( additionalConfigFilesDir != null && additionalConfigFilesDir.exists( ) )
             {
-                DirectoryScanner scanner = new DirectoryScanner();
-                scanner.addDefaultExcludes();
-                scanner.setBasedir( additionalConfigFilesDir.getPath() );
-                scanner.scan();
+                DirectoryScanner scanner = new DirectoryScanner( );
+                scanner.addDefaultExcludes( );
+                scanner.setBasedir( additionalConfigFilesDir.getPath( ) );
+                scanner.scan( );
 
-                String[] files = scanner.getIncludedFiles();
+                String[] files = scanner.getIncludedFiles( );
 
                 if ( files != null && files.length > 0 )
                 {
-                    getLog().info( "Coping additional tomcat config files" );
+                    getLog( ).info( "Coping additional tomcat config files" );
 
                     for ( int i = 0; i < files.length; i++ )
                     {
                         File file = new File( additionalConfigFilesDir, files[i] );
 
-                        getLog().info( " copy " + file.getName() );
+                        getLog( ).info( " copy " + file.getName( ) );
 
                         FileUtils.copyFileToDirectory( file, confDir );
                     }
@@ -591,7 +592,7 @@ public abstract class AbstractRunMojo
     private void copyFile( String fromPath, File toFile )
         throws IOException
     {
-        URL fromURL = getClass().getResource( fromPath );
+        URL fromURL = getClass( ).getResource( fromPath );
 
         if ( fromURL == null )
         {
@@ -608,31 +609,31 @@ public abstract class AbstractRunMojo
      * @throws LifecycleException     if the server could not be started
      * @throws MojoExecutionException if the server could not be configured
      */
-    private void startContainer()
+    private void startContainer( )
         throws IOException, LifecycleException, MojoExecutionException
     {
         // Set the system properties
-        setupSystemProperties();
+        setupSystemProperties( );
 
         final Embedded container;
         if ( serverXml != null )
         {
-            if ( !serverXml.exists() )
+            if ( !serverXml.exists( ) )
             {
-                throw new MojoExecutionException( serverXml.getPath() + " not exists" );
+                throw new MojoExecutionException( serverXml.getPath( ) + " not exists" );
             }
 
-            container = new Catalina();
-            container.setCatalinaHome( configurationDir.getAbsolutePath() );
-            ( (Catalina) container ).setConfigFile( serverXml.getPath() );
-            container.start();
+            container = new Catalina( );
+            container.setCatalinaHome( configurationDir.getAbsolutePath( ) );
+            ( (Catalina) container ).setConfigFile( serverXml.getPath( ) );
+            container.start( );
         }
         else
         {
             // create server
-            container = new Embedded();
-            container.setCatalinaHome( configurationDir.getAbsolutePath() );
-            container.setRealm( new MemoryRealm() );
+            container = new Embedded( );
+            container.setCatalinaHome( configurationDir.getAbsolutePath( ) );
+            container.setRealm( new MemoryRealm( ) );
             container.setUseNaming( useNaming );
 
             //container.createLoader( getTomcatClassLoader() ).
@@ -641,7 +642,7 @@ public abstract class AbstractRunMojo
             Context context = createContext( container );
 
             // create host
-            String appBase = new File( configurationDir, "webapps" ).getAbsolutePath();
+            String appBase = new File( configurationDir, "webapps" ).getAbsolutePath( );
             Host host = container.createHost( "localHost", appBase );
 
             host.addChild( context );
@@ -656,14 +657,14 @@ public abstract class AbstractRunMojo
             }
 
             // create engine
-            Engine engine = container.createEngine();
+            Engine engine = container.createEngine( );
             engine.setName( "localEngine" );
             engine.addChild( host );
-            engine.setDefaultHost( host.getName() );
+            engine.setDefaultHost( host.getName( ) );
             container.addEngine( engine );
             if ( useSeparateTomcatClassLoader )
             {
-                engine.setParentClassLoader( getTomcatClassLoader() );
+                engine.setParentClassLoader( getTomcatClassLoader( ) );
             }
             // create http connector
             Connector httpConnector = container.createConnector( (InetAddress) null, port, protocol );
@@ -698,13 +699,13 @@ public abstract class AbstractRunMojo
                 container.addConnector( ajpConnector );
             }
         }
-        container.start();
+        container.start( );
 
-        EmbeddedRegistry.getInstance().register( container );
+        EmbeddedRegistry.getInstance( ).register( container );
 
     }
 
-    protected ClassRealm getTomcatClassLoader()
+    protected ClassRealm getTomcatClassLoader( )
         throws MojoExecutionException
     {
         if ( this.tomcatRealm != null )
@@ -713,17 +714,17 @@ public abstract class AbstractRunMojo
         }
         try
         {
-            ClassWorld world = new ClassWorld();
-            ClassRealm root = world.newRealm( "tomcat", Thread.currentThread().getContextClassLoader() );
+            ClassWorld world = new ClassWorld( );
+            ClassRealm root = world.newRealm( "tomcat", Thread.currentThread( ).getContextClassLoader( ) );
 
-            for ( @SuppressWarnings( "rawtypes" ) Iterator i = pluginArtifacts.iterator(); i.hasNext(); )
+            for ( @SuppressWarnings( "rawtypes" ) Iterator i = pluginArtifacts.iterator( ); i.hasNext( ); )
             {
-                Artifact pluginArtifact = (Artifact) i.next();
-                if ( "org.apache.tomcat".equals( pluginArtifact.getGroupId() ) )
+                Artifact pluginArtifact = (Artifact) i.next( );
+                if ( "org.apache.tomcat".equals( pluginArtifact.getGroupId( ) ) )
                 {
-                    if ( pluginArtifact.getFile() != null )
+                    if ( pluginArtifact.getFile( ) != null )
                     {
-                        root.addURL( pluginArtifact.getFile().toURI().toURL() );
+                        root.addURL( pluginArtifact.getFile( ).toURI( ).toURL( ) );
                     }
                 }
             }
@@ -732,36 +733,36 @@ public abstract class AbstractRunMojo
         }
         catch ( DuplicateRealmException e )
         {
-            throw new MojoExecutionException( e.getMessage(), e );
+            throw new MojoExecutionException( e.getMessage( ), e );
         }
         catch ( MalformedURLException e )
         {
-            throw new MojoExecutionException( e.getMessage(), e );
+            throw new MojoExecutionException( e.getMessage( ), e );
         }
     }
 
     @SuppressWarnings( "unchecked" )
-    public Set<Artifact> getProjectArtifacts()
+    public Set<Artifact> getProjectArtifacts( )
     {
-        return project.getArtifacts();
+        return project.getArtifacts( );
     }
 
     /**
      * Causes the current thread to wait indefinitely. This method does not return.
      */
-    private void waitIndefinitely()
+    private void waitIndefinitely( )
     {
-        Object lock = new Object();
+        Object lock = new Object( );
 
         synchronized ( lock )
         {
             try
             {
-                lock.wait();
+                lock.wait( );
             }
             catch ( InterruptedException exception )
             {
-                getLog().warn( getMessage( "AbstractRunMojo.interrupted" ), exception );
+                getLog( ).warn( messagesProvider.getMessage( "AbstractRunMojo.interrupted" ), exception );
             }
         }
     }
@@ -770,24 +771,24 @@ public abstract class AbstractRunMojo
     /**
      * Set the SystemProperties from the configuration.
      */
-    private void setupSystemProperties()
+    private void setupSystemProperties( )
     {
-        if ( systemProperties != null && !systemProperties.isEmpty() )
+        if ( systemProperties != null && !systemProperties.isEmpty( ) )
         {
-            getLog().info( "setting SystemProperties:" );
+            getLog( ).info( "setting SystemProperties:" );
 
-            for ( String key : systemProperties.keySet() )
+            for ( String key : systemProperties.keySet( ) )
             {
                 String value = systemProperties.get( key );
 
                 if ( value != null )
                 {
-                    getLog().info( " " + key + "=" + value );
+                    getLog( ).info( " " + key + "=" + value );
                     System.setProperty( key, value );
                 }
                 else
                 {
-                    getLog().info( "skip sysProps " + key + " with empty value" );
+                    getLog( ).info( "skip sysProps " + key + " with empty value" );
                 }
             }
         }
@@ -804,59 +805,59 @@ public abstract class AbstractRunMojo
     private Collection<Context> createDependencyContexts( Embedded container )
         throws MojoExecutionException
     {
-        getLog().info( "Deploying dependency wars" );
+        getLog( ).info( "Deploying dependency wars" );
         // Let's add other modules
-        List<Context> contexts = new ArrayList<Context>();
+        List<Context> contexts = new ArrayList<Context>( );
 
         ScopeArtifactFilter filter = new ScopeArtifactFilter( "tomcat" );
-        @SuppressWarnings( "unchecked" ) Set<Artifact> artifacts = project.getArtifacts();
+        @SuppressWarnings( "unchecked" ) Set<Artifact> artifacts = project.getArtifacts( );
         for ( Artifact artifact : artifacts )
         {
 
             // Artifact is not yet registered and it has neither test, nor a
             // provided scope, not is it optional
-            if ( "war".equals( artifact.getType() ) && !artifact.isOptional() && filter.include( artifact ) )
+            if ( "war".equals( artifact.getType( ) ) && !artifact.isOptional( ) && filter.include( artifact ) )
             {
-                getLog().info( "Deploy warfile: " + String.valueOf( artifact.getFile() ) );
+                getLog( ).info( "Deploy warfile: " + String.valueOf( artifact.getFile( ) ) );
                 File webapps = new File( configurationDir, "webapps" );
-                File artifactWarDir = new File( webapps, artifact.getArtifactId() );
-                if ( !artifactWarDir.exists() )
+                File artifactWarDir = new File( webapps, artifact.getArtifactId( ) );
+                if ( !artifactWarDir.exists( ) )
                 {
                     //dont extract if exists
-                    artifactWarDir.mkdir();
+                    artifactWarDir.mkdir( );
                     try
                     {
                         UnArchiver unArchiver = archiverManager.getUnArchiver( "zip" );
-                        unArchiver.setSourceFile( artifact.getFile() );
+                        unArchiver.setSourceFile( artifact.getFile( ) );
                         unArchiver.setDestDirectory( artifactWarDir );
 
                         // Extract the module
-                        unArchiver.extract();
+                        unArchiver.extract( );
                     }
                     catch ( IOException e )
                     {
-                        getLog().error( e );
+                        getLog( ).error( e );
                         continue;
                     }
                     catch ( NoSuchArchiverException e )
                     {
-                        getLog().error( e );
+                        getLog( ).error( e );
                         continue;
                     }
                     catch ( ArchiverException e )
                     {
-                        getLog().error( e );
+                        getLog( ).error( e );
                         continue;
                     }
                 }
-                WebappLoader webappLoader = new WebappLoader( Thread.currentThread().getContextClassLoader() );
+                WebappLoader webappLoader = new WebappLoader( Thread.currentThread( ).getContextClassLoader( ) );
                 Context context =
-                    container.createContext( "/" + artifact.getArtifactId(), artifactWarDir.getAbsolutePath() );
+                    container.createContext( "/" + artifact.getArtifactId( ), artifactWarDir.getAbsolutePath( ) );
                 context.setLoader( webappLoader );
-                File contextFile = getContextFile();
+                File contextFile = getContextFile( );
                 if ( contextFile != null )
                 {
-                    context.setConfigFile( getContextFile().getAbsolutePath() );
+                    context.setConfigFile( getContextFile( ).getAbsolutePath( ) );
                 }
                 contexts.add( context );
 

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractWarCatalinaMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractWarCatalinaMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractWarCatalinaMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/AbstractWarCatalinaMojo.java Mon Oct  3 22:16:47 2011
@@ -63,7 +63,7 @@ public abstract class AbstractWarCatalin
     {
         if ( !isWar() )
         {
-            getLog().info( getMessage( "AbstractWarCatalinaMojo.nonWar" ) );
+            getLog().info( messagesProvider.getMessage( "AbstractWarCatalinaMojo.nonWar" ) );
             return;
         }
 

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExplodedMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExplodedMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExplodedMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ExplodedMojo.java Mon Oct  3 22:16:47 2011
@@ -68,7 +68,7 @@ public class ExplodedMojo
     {
         if ( !warDirectory.exists() || !warDirectory.isDirectory() )
         {
-            throw new MojoExecutionException( getMessage( "ExplodedMojo.missingWar", warDirectory.getPath() ) );
+            throw new MojoExecutionException( messagesProvider.getMessage( "ExplodedMojo.missingWar", warDirectory.getPath() ) );
         }
     }
 }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/InplaceMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/InplaceMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/InplaceMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/InplaceMojo.java Mon Oct  3 22:16:47 2011
@@ -68,7 +68,7 @@ public class InplaceMojo
     {
         if ( !warSourceDirectory.exists() || !warSourceDirectory.isDirectory() )
         {
-            throw new MojoExecutionException( getMessage( "InplaceMojo.missingWar", warSourceDirectory.getPath() ) );
+            throw new MojoExecutionException( messagesProvider.getMessage( "InplaceMojo.missingWar", warSourceDirectory.getPath() ) );
         }
     }
 }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ListMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ListMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ListMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ListMojo.java Mon Oct  3 22:16:47 2011
@@ -44,7 +44,7 @@ public class ListMojo
     protected void invokeManager()
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        getLog().info( getMessage( "ListMojo.listApps", getURL() ) );
+        getLog().info( messagesProvider.getMessage( "ListMojo.listApps", getURL() ) );
 
         log( getManager().list() );
     }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ReloadMojo.java Mon Oct  3 22:16:47 2011
@@ -44,7 +44,7 @@ public class ReloadMojo
     protected void invokeManager()
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        getLog().info( getMessage( "RedeployMojo.redeployApp", getDeployedURL() ) );
+        getLog().info( messagesProvider.getMessage( "RedeployMojo.redeployApp", getDeployedURL() ) );
 
         log( getManager().reload( getPath() ) );
     }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ResourcesMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ResourcesMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ResourcesMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ResourcesMojo.java Mon Oct  3 22:16:47 2011
@@ -57,11 +57,11 @@ public class ResourcesMojo
     {
         if ( type == null )
         {
-            getLog().info( getMessage( "ResourcesMojo.listAllResources", getURL() ) );
+            getLog().info( messagesProvider.getMessage( "ResourcesMojo.listAllResources", getURL() ) );
         }
         else
         {
-            getLog().info( getMessage( "ResourcesMojo.listTypedResources", type, getURL() ) );
+            getLog().info( messagesProvider.getMessage( "ResourcesMojo.listTypedResources", type, getURL() ) );
         }
 
         log( getManager().getResources( type ) );

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RolesMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RolesMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RolesMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/RolesMojo.java Mon Oct  3 22:16:47 2011
@@ -44,7 +44,7 @@ public class RolesMojo
     protected void invokeManager()
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        getLog().info( getMessage( "RolesMojo.listRoles", getURL() ) );
+        getLog().info( messagesProvider.getMessage( "RolesMojo.listRoles", getURL() ) );
 
         log( getManager().getRoles() );
     }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ServerInfoMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ServerInfoMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ServerInfoMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ServerInfoMojo.java Mon Oct  3 22:16:47 2011
@@ -44,7 +44,7 @@ public class ServerInfoMojo
     protected void invokeManager()
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        getLog().info( getMessage( "ServerInfoMojo.listInfo", getURL() ) );
+        getLog().info( messagesProvider.getMessage( "ServerInfoMojo.listInfo", getURL() ) );
 
         log( getManager().getServerInfo() );
     }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/SessionsMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/SessionsMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/SessionsMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/SessionsMojo.java Mon Oct  3 22:16:47 2011
@@ -44,7 +44,7 @@ public class SessionsMojo
     protected void invokeManager()
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        getLog().info( getMessage( "SessionsMojo.listSessions", getDeployedURL() ) );
+        getLog().info( messagesProvider.getMessage( "SessionsMojo.listSessions", getDeployedURL() ) );
 
         log( getManager().getSessions( getPath() ) );
     }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ShutdownMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ShutdownMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ShutdownMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/ShutdownMojo.java Mon Oct  3 22:16:47 2011
@@ -1,28 +1,26 @@
 package org.apache.tomcat.maven.plugin;
 
-
 /*
- * 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.
- */
+* 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.
+*/
 
 import org.apache.catalina.LifecycleException;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.tomcat.maven.common.AbstractI18NTomcatMojo;
 
 
 /**
@@ -34,9 +32,10 @@ import org.apache.tomcat.maven.common.Ab
  * By default the <code>shutdown</code> goal is not bound to any phase. For integration tests
  * you might want to bind it to <code>post-integration-test</code>.
  * </p>
+ *
+ * @author Mark Michaelis
  * @goal shutdown
  * @requiresDependencyResolution runtime
- * @author Mark Michaelis
  * @since 1.1
  */
 public class ShutdownMojo
@@ -44,19 +43,19 @@ public class ShutdownMojo
 {
     /**
      * Shuts down all embedded tomcats which got started up to now.
-     * 
+     *
      * @throws MojoExecutionException if shutting down one or all servers failed
      */
-    public void execute()
+    public void execute( )
         throws MojoExecutionException
     {
         try
         {
-            EmbeddedRegistry.getInstance().shutdownAll( getLog() );
+            EmbeddedRegistry.getInstance( ).shutdownAll( getLog( ) );
         }
         catch ( LifecycleException e )
         {
-            throw new MojoExecutionException( getMessage( "ShutdownMojo.shutdownError" ), e );
+            throw new MojoExecutionException( messagesProvider.getMessage( "ShutdownMojo.shutdownError" ), e );
         }
     }
 }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StartMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StartMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StartMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StartMojo.java Mon Oct  3 22:16:47 2011
@@ -44,7 +44,7 @@ public class StartMojo
     protected void invokeManager()
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        getLog().info( getMessage( "StartMojo.startingApp", getDeployedURL() ) );
+        getLog().info( messagesProvider.getMessage( "StartMojo.startingApp", getDeployedURL() ) );
 
         log( getManager().start( getPath() ) );
     }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StopMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StopMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StopMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/StopMojo.java Mon Oct  3 22:16:47 2011
@@ -44,7 +44,7 @@ public class StopMojo
     protected void invokeManager()
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        getLog().info( getMessage( "StopMojo.stoppingApp", getDeployedURL() ) );
+        getLog().info( messagesProvider.getMessage( "StopMojo.stoppingApp", getDeployedURL() ) );
 
         log( getManager().stop( getPath() ) );
     }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/UndeployMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/UndeployMojo.java?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/UndeployMojo.java (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/UndeployMojo.java Mon Oct  3 22:16:47 2011
@@ -55,7 +55,7 @@ public class UndeployMojo
     protected void invokeManager()
         throws MojoExecutionException, TomcatManagerException, IOException
     {
-        getLog().info( getMessage( "UndeployMojo.undeployingApp", getDeployedURL() ) );
+        getLog().info( messagesProvider.getMessage( "UndeployMojo.undeployingApp", getDeployedURL() ) );
 
         try
         {
@@ -68,7 +68,7 @@ public class UndeployMojo
                 throw exception;
             }
 
-            getLog().warn( getMessage( "UndeployMojo.undeployError", exception.getMessage() ) );
+            getLog().warn( messagesProvider.getMessage( "UndeployMojo.undeployError", exception.getMessage() ) );
         }
     }
 }

Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml?rev=1178615&r1=1178614&r2=1178615&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/test/resources/simple-war-project/pom.xml Mon Oct  3 22:16:47 2011
@@ -30,10 +30,16 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
           <version>2.1-alpha-2</version>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.3.2</version>
+        </plugin>
+        <plugin>
           <groupId>org.apache.tomcat.maven</groupId>
           <artifactId>tomcat6-maven-plugin</artifactId>
           <version>${project.version}</version>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message