If getGoalName() is going to return a class name, then I suggest that getGoalName() be removed or renamed... as these are no longer what I would expect a call to getGoalName() to return.

--jason


On Nov 7, 2006, at 8:39 AM, [EMAIL PROTECTED] wrote:

Author: prasad
Date: Tue Nov  7 08:39:33 2006
New Revision: 472156

URL: http://svn.apache.org/viewvc?view=rev&rev=472156
Log:
* getGoalName had hardcoded strings in them (mojo names)
* changed them to return the packageName + className
* surefire reporting needs the package name.

Modified:
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ DeployModuleMojo.java geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ ListModulesMojo.java geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ StartModuleMojo.java geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ StopModuleMojo.java geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ UndeployModuleMojo.java geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ InstallAssemblyMojo.java geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ StartServerMojo.java geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ StopServerMojo.java geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ WaitForServerMojo.java

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ DeployModuleMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/module/DeployModuleMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ DeployModuleMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ DeployModuleMojo.java Tue Nov 7 08:39:33 2006
@@ -158,9 +158,6 @@
     }

     protected String getGoalName() {
-        //
- // FIXME: There has to be way this can be computed instead of hardcoded absolutely.
-        //
-        return "deploy-module";
-    }
+        return this.getClass().getName();
+    }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ ListModulesMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/module/ListModulesMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ ListModulesMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ ListModulesMojo.java Tue Nov 7 08:39:33 2006
@@ -51,6 +51,6 @@
     }

     protected String getGoalName() {
-        return "list-modules";
+        return this.getClass().getName();
     }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ StartModuleMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/module/StartModuleMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ StartModuleMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ StartModuleMojo.java Tue Nov 7 08:39:33 2006
@@ -38,9 +38,6 @@
     }

     protected String getGoalName() {
-        //
- // FIXME: There has to be way this can be computed instead of hardcoded absolutely.
-        //
-        return "start-module";
-    }
+        return this.getClass().getName();
+    }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ StopModuleMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/module/StopModuleMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ StopModuleMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ StopModuleMojo.java Tue Nov 7 08:39:33 2006
@@ -38,9 +38,6 @@
     }

     protected String getGoalName() {
-        //
- // FIXME: There has to be way this can be computed instead of hardcoded absolutely.
-        //
-        return "stop-module";
+        return this.getClass().getName();
     }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ UndeployModuleMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/module/UndeployModuleMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ UndeployModuleMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/module/ UndeployModuleMojo.java Tue Nov 7 08:39:33 2006
@@ -38,9 +38,6 @@
     }

     protected String getGoalName() {
-        //
- // FIXME: There has to be way this can be computed instead of hardcoded absolutely.
-        //
-        return "undeploy-module";
-    }
+        return this.getClass().getName();
+    }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/ InstallAssemblyMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/server/InstallAssemblyMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ InstallAssemblyMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ InstallAssemblyMojo.java Tue Nov 7 08:39:33 2006
@@ -34,6 +34,6 @@
     }

     protected String getGoalName() {
-        return "install-assembly";
-    }
+        return this.getClass().getName();
+    }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/ StartServerMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/server/StartServerMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ StartServerMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ StartServerMojo.java Tue Nov 7 08:39:33 2006
@@ -360,10 +360,6 @@
     }

     protected String getGoalName() {
-        //
- // FIXME: There has to be way this can be computed instead of hardcoded absolutely.
-        //
-
-        return "start-server";
-    }
+        return this.getClass().getName();
+    }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/ StopServerMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/server/StopServerMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ StopServerMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ StopServerMojo.java Tue Nov 7 08:39:33 2006
@@ -56,6 +56,6 @@
     }

     protected String getGoalName() {
-        return "stop-server";
-    }
+        return this.getClass().getName();
+    }
 }

Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/ src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/ WaitForServerMojo.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven- plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/ mavenplugins/geronimo/server/WaitForServerMojo.java? view=diff&rev=472156&r1=472155&r2=472156 ====================================================================== ======== --- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ WaitForServerMojo.java (original) +++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/ main/java/org/apache/geronimo/mavenplugins/geronimo/server/ WaitForServerMojo.java Tue Nov 7 08:39:33 2006
@@ -94,9 +94,6 @@
     }

     protected String getGoalName() {
-        //
- //FIXME: There has to be way this can be computed instead of hardcoded absolutely.
-        //
-        return "wait-for-server";
-    }
+        return this.getClass().getName();
+    }
 }



Reply via email to