svn commit: r220324 - /maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java

[brett]

Author: brett
Date: Fri Jul 22 07:17:24 2005
New Revision: 220324

URL: http://svn.apache.org/viewcvs?rev=220324&view=rev
Log:
correct equals

Modified:
    
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java

Modified: 
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
URL: 
http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java?rev=220324&r1=220323&r2=220324&view=diff
==============================================================================
--- 
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
 (original)
+++ 
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/WarMojo.java
 Fri Jul 22 07:17:24 2005
@@ -62,7 +62,6 @@
 
     /**
      * @todo Convert to File
-     * 
      * @parameter expression="${project.build.outputDirectory}"
      * @required
      * @readonly
@@ -77,7 +76,6 @@
 
     /**
      * @todo Convert to File
-     * 
      * @parameter 
expression="${project.build.directory}/${project.build.finalName}"
      * @required
      */
@@ -85,7 +83,6 @@
 
     /**
      * @todo Convert to File
-     * 
      * @parameter expression="${basedir}/src/main/webapp"
      * @required
      */
@@ -124,7 +121,7 @@
                                String webXml )
         throws IOException
     {
-        if ( sourceDirectory != webappDirectory )
+        if ( !sourceDirectory.equals( webappDirectory ) )
         {
             getLog().info( "Copy webapp resources to " + 
webappDirectory.getAbsolutePath() );
 
@@ -141,10 +138,6 @@
         }
     }
 
-    /**
-     * @throws MojoExecutionException 
-     *
-     */
     public void buildWebapp( MavenProject project )
         throws IOException
     {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]