You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/12/31 12:07:46 UTC
svn commit: r1722436 - in /maven/plugins/trunk/maven-ejb-plugin/src: main/java/org/apache/maven/plugins/ejb/EjbHelper.java main/java/org/apache/maven/plugins/ejb/EjbMojo.java test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java

Author: khmarbaise
Date: Thu Dec 31 11:07:46 2015
New Revision: 1722436

URL: http://svn.apache.org/viewvc?rev=1722436&view=rev
Log:
Renamed getJarFileName into getJarFile

Modified:
    maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbHelper.java
    maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
    maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java

Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbHelper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbHelper.java?rev=1722436&r1=1722435&r2=1722436&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbHelper.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbHelper.java Thu Dec 31 11:07:46 2015
@@ -84,7 +84,7 @@ public final class EjbHelper
      * @param classifier an optional classifier
      * @return the file to generate
      */
-    public static File getJarFileName( File basedir, String finalName, String classifier )
+    public static File getJarFile( File basedir, String finalName, String classifier )
     {
         if ( basedir == null )
         {

Modified: maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java?rev=1722436&r1=1722435&r2=1722436&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java Thu Dec 31 11:07:46 2015
@@ -349,7 +349,7 @@ public class EjbMojo
     private File generateEjb()
         throws MojoExecutionException
     {
-        File jarFile = EjbHelper.getJarFileName( outputDirectory, jarName, getClassifier() );
+        File jarFile = EjbHelper.getJarFile( outputDirectory, jarName, getClassifier() );
 
         getLog().info( "Building EJB " + jarName + " with EJB version " + ejbVersion );
 
@@ -416,7 +416,7 @@ public class EjbMojo
     private File generateEjbClient()
         throws MojoExecutionException
     {
-        File clientJarFile = EjbHelper.getJarFileName( outputDirectory, jarName, getClientClassifier() );
+        File clientJarFile = EjbHelper.getJarFile( outputDirectory, jarName, getClientClassifier() );
 
         getLog().info( "Building EJB client " + clientJarFile.getPath() );
 

Modified: maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java?rev=1722436&r1=1722435&r2=1722436&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java (original)
+++ maven/plugins/trunk/maven-ejb-plugin/src/test/java/org/apache/maven/plugins/ejb/EjbHelperTest.java Thu Dec 31 11:07:46 2015
@@ -79,14 +79,14 @@ public class EjbHelperTest
     @Test
     public void getJarFileNameShouldReturnFileNameWithoutClassifier()
     {
-        assertThat( EjbHelper.getJarFileName( new File( "base" ), "test",
+        assertThat( EjbHelper.getJarFile( new File( "base" ), "test",
                                               null ) ).isEqualTo( new File( "base/test.jar" ) );
     }
 
     @Test
     public void getJarFileNameShouldReturnFileNameWithClassifier()
     {
-        assertThat( EjbHelper.getJarFileName( new File( "base" ), "test",
+        assertThat( EjbHelper.getJarFile( new File( "base" ), "test",
                                               "alpha" ) ).isEqualTo( new File( "base/test-alpha.jar" ) );
     }
 }