svn commit: r1721693 - /maven/plugins/trunk/maven-ejb-plugin/src/main/java/org/apache/maven/plugins/ejb/EjbMojo.java

[khmarbaise]

Author: khmarbaise
Date: Fri Dec 25 19:51:24 2015
New Revision: 1721693

URL: http://svn.apache.org/viewvc?rev=1721693&view=rev
Log:
Refactoring Mojo

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

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=1721693&r1=1721692&r2=1721693&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
 Fri Dec 25 19:51:24 2015
@@ -288,7 +288,18 @@ public class EjbMojo
 
         if ( generateClient )
         {
-            generateEjbClient();
+            File clientJarFile = generateEjbClient();
+            // TODO: shouldn't need classifer
+            // TODO: For 3.0 this should be changed having a separate 
classifier for main artifact and ejb-client.
+            if ( classifier != null )
+            {
+                projectHelper.attachArtifact( project, "ejb-client", 
classifier + "-client", clientJarFile );
+            }
+            else
+            {
+                projectHelper.attachArtifact( project, "ejb-client", "client", 
clientJarFile );
+            }
+
         }
     }
 
@@ -360,7 +371,7 @@ public class EjbMojo
 
     }
 
-    private void generateEjbClient()
+    private File generateEjbClient()
         throws MojoExecutionException
     {
         String clientJarName = jarName;
@@ -422,16 +433,7 @@ public class EjbMojo
                                               e );
         }
 
-        // TODO: shouldn't need classifer
-        // TODO: For 3.0 this should be changed having a separate classifier 
for main artifact and ejb-client.
-        if ( classifier != null )
-        {
-            projectHelper.attachArtifact( project, "ejb-client", classifier + 
"-client", clientJarFile );
-        }
-        else
-        {
-            projectHelper.attachArtifact( project, "ejb-client", "client", 
clientJarFile );
-        }
+        return clientJarFile;
     }
 
     private void checkEJBVersionCompliance( File deploymentDescriptor )