Issue #130 - enable build and deploy of simple application

rakillen · rakillen · commit 07dae7739fdb · 2018-06-20T18:21:05.000-04:00
diff --git a/core/src/main/samples/docker-domain/build-archive.sh b/core/src/main/samples/docker-domain/build-archive.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+#Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
+#
+#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+#
+rm -Rf archive
+mkdir -p archive/wlsdeploy/applications
+cd simple-app
+jar cvf ../archive/wlsdeploy/applications/simple-app.war *
+cd ../archive
+jar cvf ../archive.zip *
diff --git a/core/src/main/samples/docker-domain/build.sh b/core/src/main/samples/docker-domain/build.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 #
-#Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.
+#Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
 #
 #Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 #
 docker build \
     --build-arg WDT_MODEL=simple-topology.yaml \
+    --build-arg WDT_ARCHIVE=archive.zip \
     -t 12213-domain-wdt .
 
diff --git a/core/src/main/samples/docker-domain/simple-app/WEB-INF/web.xml b/core/src/main/samples/docker-domain/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/core/src/main/samples/docker-domain/simple-app/WEB-INF/weblogic.xml b/core/src/main/samples/docker-domain/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/core/src/main/samples/docker-domain/simple-app/simple.html b/core/src/main/samples/docker-domain/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/core/src/main/samples/docker-domain/simple-topology.yaml b/core/src/main/samples/docker-domain/simple-topology.yaml
@@ -88,3 +88,12 @@ resources:
                     MaxCapacity: 15
                     TestTableName: SQL ISVALID
                     TestConnectionsOnReserve: true
+appDeployments:
+    Application:
+        # Quote needed because of hyphen in string
+        'simple-app':
+            SourcePath: 'wlsdeploy/applications/simple-app.war'
+            Target: AdminServer
+            ModuleType: war
+            StagingMode: nostage
+            PlanStagingMode: nostage

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`	`#`
`3`		`-#Copyright (c) 2014-2018 Oracle and/or its affiliates. All rights reserved.`
	`3`	`+#Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.`
`4`	`4`	`#`
`5`	`5`	`#Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.`
`6`	`6`	`#`
`7`	`7`	`docker build \`
`8`	`8`	`--build-arg WDT_MODEL=simple-topology.yaml \`
	`9`	`+ --build-arg WDT_ARCHIVE=archive.zip \`
`9`	`10`	`-t 12213-domain-wdt .`
`10`	`11`