From f0955cff982ea2f69f75d282f8d291badb593206 Mon Sep 17 00:00:00 2001
From: Martin Bergljung <gravitonian@gmail.com>
Date: Tue, 6 Sep 2016 09:19:34 +0100
Subject: [PATCH] Changed where Enterprise license should be located, #395

---
 .../org/alfresco/maven/plugin/RunMojo.java    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
index 11b87d48..393b5e74 100644
--- a/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
+++ b/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java
@@ -455,6 +455,7 @@ public class RunMojo extends AbstractMojo {
 
     /**
      * Copy the Alfresco Enterprise license to its correct place in the Platform WAR, if it exists.
+     * It is not enough to have it on the test classpath, then it will start up as Trial license...
      *
      * @throws MojoExecutionException
      */
@@ -480,7 +481,7 @@ public class RunMojo extends AbstractMojo {
                         element(name("outputDirectory"), licDestDir),
                         element(name("resources"),
                                 element(name("resource"),
-                                        element(name("directory"), "src/main/resources/alfresco/extension/license"),
+                                        element(name("directory"), "src/test/license"),
                                         element(name("includes"),
                                                 element(name("include"), "*.lic")
                                         ),
@@ -888,9 +889,7 @@ public class RunMojo extends AbstractMojo {
      * @return true if platform version >= 5.1
      */
     private boolean isPlatformVersionGtOrEqTo51() {
-        int versionNumber = Integer.parseInt(
-                alfrescoPlatformVersion.replaceAll("[^0-9]", "").substring(0, 2));
-        if (versionNumber >= 51) {
+        if (getPlatformVersionNumber() >= 51) {
             return true;
         }
 
@@ -904,15 +903,22 @@ public class RunMojo extends AbstractMojo {
      * @return true if platform version <= 4.2
      */
     private boolean isPlatformVersionLtOrEqTo42() {
-        int versionNumber = Integer.parseInt(
-                alfrescoPlatformVersion.replaceAll("[^0-9]", "").substring(0, 2));
-        if (versionNumber <= 42) {
+        if (getPlatformVersionNumber() <= 42) {
             return true;
         }
 
         return false;
     }
 
+    /**
+     * Grabs the first 2 numbers in the version string
+     *
+     * @return major and minor version as int, such as 41,50,51
+     */
+    private int getPlatformVersionNumber() {
+        return Integer.parseInt(alfrescoPlatformVersion.replaceAll("[^0-9]", "").substring(0, 2));
+    }
+
     /**
      * Get the Solr artifactId, it changes when we move to Solr 4 in Alfresco version 5
      *