Fixes artifactId pro maven model

Signed-off-by: Michal Karm Babacek <[email protected]>

Author: Karm

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/MicroprofileServersAddon.java

@@ -149,15 +149,17 @@ public void adaptMavenModel(Model pomFile, JessieModel model, boolean mainProjec
             mavenHelper.addDependency(pomFile, "org.bouncycastle", "bcpkix-jdk15on", "1.53");
         }
 
-        if (model.hasMainAndSecondaryProject()) {
+        // Needs refactoring and review  for Liberty and possibly Helidon.
+        /*if (model.hasMainAndSecondaryProject()) {
             String artifactID = pomFile.getArtifactId();
             if (mainProject) {
                 pomFile.setArtifactId(artifactID + "-" + JessieModel.MAIN_INDICATOR);
             } else {
                 pomFile.setArtifactId(artifactID + "-" + JessieModel.SECONDARY_INDICATOR);
             }
+            model.getMaven().setArtifactId(pomFile.getArtifactId());
             pomFile.getBuild().setFinalName(artifactID);
-        }
+        }*/
 
     }
 

src/main/java/org/eclipse/microprofile/starter/addon/microprofile/servers/model/SupportedServer.java

@@ -51,8 +51,8 @@ public enum SupportedServer {
                     MicroProfileVersion.MP30)
             , "%s.jar" //jarFileName
             , "" //jarParameters // Hard coded in server.xml since no way of overriding a default.
-            , "http://localhost:8181/%s" //testURL
-            , "http://localhost:8281/%s" //secondaryURL // This need to match with port value from server.xml
+            , "http://localhost:8181/" //testURL, %s would be replaced with artifactId
+            , "http://localhost:8281/" //secondaryURL // This need to match with port value from server.xml, %s would be replaced with artifactId
             )
     , KUMULUZEE("kumuluzEE", "KumuluzEE",
             Arrays.asList(MicroProfileVersion.MP12, MicroProfileVersion.MP13, MicroProfileVersion.MP14,

src/main/resources/files/liberty/service-b/server.xml.tpl

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<server description="${app.name}">
+<server description="${project.name}">
 
     <featureManager>
         <feature>microProfile-[# th:text="${mp_version}"/]</feature>
@@ -9,7 +9,7 @@
                   httpPort="8281"
                   httpsPort="8643"/>
 
-    <webApplication location="${app.name}.war" contextRoot="/"/>
+    <webApplication location="${project.name}.war" contextRoot="/"/>
     <mpMetrics authentication="false"/>
     <!-- This is the keystore that will be used by SSL and by JWT. -->
     <keyStore id="defaultKeyStore" location="public.jks" type="JKS" password="atbash" />

src/main/resources/pom-servers.xml

@@ -131,14 +131,11 @@
             <id>liberty</id>
 
             <properties>
-
                 <httpPort>8181</httpPort>
                 <httpsPort>8543</httpsPort>
-                <jwt.issuer>https://server.example.com</jwt.issuer>
             </properties>
             <build>
                 <finalName>${project.artifactId}</finalName>
-                
 
                 <plugins>
                     <plugin>
@@ -163,8 +160,8 @@
                             <configDirectory>${project.basedir}/src/main/liberty/server</configDirectory>
                             <bootstrapProperties>
                                 <project.name>${project.artifactId}</project.name>
+                                <jwt.issuer>https://server.example.com</jwt.issuer>
                             </bootstrapProperties>
-
                         </configuration>
                         <executions>
                             <execution>