Add test debug

dev/devfile.yaml

@@ -1,7 +1,7 @@
 schemaVersion: 2.0.0
 metadata:
   name: java-openliberty
-  version: 0.1.2
+  version: 0.1.3
   description: Java application stack using Open Liberty runtime
 starterProjects:
   - name: user-app
@@ -14,7 +14,7 @@ components:
       name: devruntime
       # this custom image source can be found in the baseimage section of the repo at:
       # https://github.com/OpenLiberty/application-stack.git
-      image: ajymau/java-openliberty-odo:0.1.2
+      image: ajymau/java-openliberty-odo:0.1.3
       memoryLimit: 1512Mi
       mountSources: true
       endpoints:
@@ -43,8 +43,8 @@ commands:
                    else
                        echo "will run the devBuild command" && echo "...moving liberty"
                                                             && mkdir -p /projects/target/liberty
-                                                            && mv /opt/ol/wlp /projects/target/liberty
                                                             && mvn -Dmaven.repo.local=/mvn/repository package
+                                                            && mv /opt/ol/wlp /projects/target/liberty
                                                             && touch ./.disable-bld-cmd;
                    fi
       workingDir: /projects
@@ -54,22 +54,42 @@ commands:
         kind: build 
         isDefault: true
   - exec:
-      id: devRun
+      id: run
       component: devruntime 
-      commandLine: mvn -Dmaven.repo.local=/mvn/repository -Dliberty.runtime.version=20.0.0.9 -DhotTests=true liberty:dev
+      commandLine: mvn -Dmaven.repo.local=/mvn/repository -Dliberty.runtime.version=20.0.0.9 -Ddebug=false -DhotTests=true -DcompileWait=3 liberty:dev
       workingDir: /projects
       attributes:
         restart: "false"
       group:
         kind: run
         isDefault: true
   - exec:
-      id: devRunDisableHotTests
+      id: run-test-off
       component: devruntime
-      commandLine: mvn -Dmaven.repo.local=/mvn/repository -Dliberty.runtime.version=20.0.0.9 liberty:dev
+      commandLine: mvn -Dmaven.repo.local=/mvn/repository -Dliberty.runtime.version=20.0.0.9 -Ddebug=false liberty:dev
       workingDir: /projects
       attributes:
         restart: "false"
       group:
         kind: run
         isDefault: false
+  - exec:
+      id: debug
+      component: devruntime 
+      commandLine: mvn -Dmaven.repo.local=/mvn/repository -Dliberty.runtime.version=20.0.0.9 -DdebugPort=${DEBUG_PORT} liberty:dev -Dliberty.env.WLP_DEBUG_REMOTE=y
+      workingDir: /projects
+      attributes:
+        restart: "false"
+      group:
+        kind: debug
+        isDefault: true
+  - exec:
+      id: test
+      component: devruntime 
+      commandLine: mvn -Dmaven.repo.local=/mvn/repository -Dmicroshed_hostname=localhost -Dmicroshed_http_port=9080 -Dmicroshed_manual_env=true -Dmicroshed_app_context_root=/ failsafe:integration-test
+      workingDir: /projects
+      attributes:
+        restart: "false"
+      group:
+        kind: test
+        isDefault: true

templates/default/.odoignore

@@ -0,0 +1 @@
+/target

templates/default/pom.xml

@@ -120,6 +120,7 @@
                 <artifactId>liberty-maven-plugin</artifactId>
                 <version>${version.liberty-maven-plugin}</version>
                 <configuration>
+                    <mergeServerEnv>true</mergeServerEnv>
                     <stripVersion>true</stripVersion>
                     <serverStartTimeout>360</serverStartTimeout>
                     <bootstrapProperties>
@@ -158,7 +159,7 @@
                 <executions>
                     <execution>
                         <phase>integration-test</phase>
-                        <id>it-exec</id>
+                        <id>default-cli</id>
                         <goals>
                             <goal>integration-test</goal>
                         </goals>

templates/default/src/main/liberty/config/server.xml

@@ -12,5 +12,7 @@
         httpsPort="${default.https.port}" id="defaultHttpEndpoint"/>
 
     <httpDispatcher enableWelcomePage="false" />
+
+    <webApplication contextRoot="/" location="starter.war" />
 
 </server>

templates/default/src/test/java/it/dev/appsody/starter/JaxrsTestit.java

@@ -32,7 +32,7 @@ public class JaxrsTestit {
 
 	@Container
     public static ApplicationContainer app = new ApplicationContainer()
-                    .withAppContextRoot("/starter")
+                    .withAppContextRoot("/")
                     .withReadinessPath("/health/ready")
                     .withEnv("DEFAULT_HTTP_PORT", "9080")
 	                .withEnv("DEFAULT_HTTPS_PORT", "9443");
@@ -47,4 +47,4 @@ public void testAppResponse() {
 		   assertEquals("Hello! Welcome to Openliberty", appService.getRequest());
 	}
 
-}
+}