Build simple-app.war correctly for system test (#1158)

rakillen · web-flow · commit d94dfb0078ab · 2022-08-26T13:23:10.000-05:00
diff --git a/system-test/src/test/resources/archive/simple-app/WEB-INF/web.xml b/system-test/src/test/resources/archive/simple-app/WEB-INF/web.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+  <welcome-file-list>
+    <welcome-file>/simple.html</welcome-file>
+  </welcome-file-list>
+</web-app>
diff --git a/system-test/src/test/resources/archive/simple-app/WEB-INF/weblogic.xml b/system-test/src/test/resources/archive/simple-app/WEB-INF/weblogic.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<weblogic-web-app xmlns="http://www.bea.com/ns/weblogic/90">
+  <context-root>/simple</context-root>
+</weblogic-web-app>
diff --git a/system-test/src/test/resources/archive/simple-app/simple.html b/system-test/src/test/resources/archive/simple-app/simple.html
@@ -0,0 +1,9 @@
+<html>
+  <head>
+    <title>Simple Application</title>
+  </head>
+  <body>
+    <h1>Simple Application</h1>
+    <p>This is the simple application.</p>
+  </body>
+</html>
diff --git a/system-test/src/test/resources/build-archive.sh b/system-test/src/test/resources/build-archive.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 #
-# Copyright (c) 2018, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2018, 2022, Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
 projectDir=$(pwd)
 archiveDir=${projectDir}/target/resources/archive
-rm -Rf $archiveDir
-mkdir -p $archiveDir/wlsdeploy/applications
-cd ../samples/docker-domain/simple-app
-jar cvf $archiveDir/wlsdeploy/applications/simple-app.war  *
-cd $archiveDir
-jar cvf ../archive.zip *
+rm -Rf "$archiveDir"
+mkdir -p "$archiveDir"/wlsdeploy/applications
+cd "$projectDir"/src/test/resources/archive/simple-app || exit
+jar cvf "$archiveDir"/wlsdeploy/applications/simple-app.war  ./*
+cd "$archiveDir" || exit
+jar cvf ../archive.zip ./*
