From 3aedfffe2f9e1ed85c3d10f6166cf650fd793a6e Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero@chavero.com.mx>
Date: Mon, 17 Jun 2019 11:54:48 -0500
Subject: [PATCH 1/5] Update wildfly swarm to thorntail

---
 java-serverhost/pom.xml | 42 ++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/java-serverhost/pom.xml b/java-serverhost/pom.xml
index 39e3a1c..da2c486 100644
--- a/java-serverhost/pom.xml
+++ b/java-serverhost/pom.xml
@@ -8,20 +8,36 @@
   <version>1.0</version>
   <packaging>war</packaging>
 
+
   <properties>
-    <version.wildfly.swarm>2017.10.0</version.wildfly.swarm>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <failOnMissingWebXml>false</failOnMissingWebXml>
+    <!-- Explicitly declaring the source encoding eliminates the following
+      message: -->
+    <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
+      resources, i.e. build is platform dependent! -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <failOnMissingWebXml>false</failOnMissingWebXml>
+
+    <!-- Thorntail dependency versions -->
+    <version.thorntail>2.4.0.Final</version.thorntail>
+
+    <!-- other plugin versions -->
+    <version.compiler.plugin>3.1</version.compiler.plugin>
+    <version.surefire.plugin>2.16</version.surefire.plugin>
+    <version.war.plugin>2.5</version.war.plugin>
+
+    <!-- maven-compiler-plugin -->
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+
   </properties>
 
+
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>org.wildfly.swarm</groupId>
+        <groupId>io.thorntail</groupId>
         <artifactId>bom-all</artifactId>
-        <version>${version.wildfly.swarm}</version>
+        <version>${version.thorntail}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -32,9 +48,9 @@
     <finalName>java-serverhost</finalName>
     <plugins>
       <plugin>
-        <groupId>org.wildfly.swarm</groupId>
-        <artifactId>wildfly-swarm-plugin</artifactId>
-        <version>${version.wildfly.swarm}</version>
+        <groupId>io.thorntail</groupId>
+        <artifactId>thorntail-maven-plugin</artifactId>
+        <version>${version.thorntail}</version>
         
         <executions>
           <execution>
@@ -48,6 +64,14 @@
   </build>
 
   <dependencies>
+		<dependency>
+			<groupId>io.thorntail</groupId>
+			<artifactId>cdi</artifactId>
+		</dependency>
+    <dependency>
+      <groupId>io.thorntail</groupId>
+      <artifactId>jaxrs</artifactId>
+    </dependency>
     <!-- Java EE 7 dependency -->
     <dependency>
       <groupId>javax</groupId>

From dec01143fb283d2403aed4e7d31f9e479a202e6f Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero@chavero.com.mx>
Date: Tue, 18 Jun 2019 16:40:15 -0500
Subject: [PATCH 2/5] Fix swarm to thorntail migration

---
 java-serverhost/pom.xml | 42 ++++++++---------------------------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/java-serverhost/pom.xml b/java-serverhost/pom.xml
index da2c486..0403048 100644
--- a/java-serverhost/pom.xml
+++ b/java-serverhost/pom.xml
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.redhat.training.example</groupId>
   <artifactId>java-serverhost</artifactId>
@@ -8,36 +6,20 @@
   <version>1.0</version>
   <packaging>war</packaging>
 
-
   <properties>
-    <!-- Explicitly declaring the source encoding eliminates the following
-      message: -->
-    <!-- [WARNING] Using platform encoding (UTF-8 actually) to copy filtered
-      resources, i.e. build is platform dependent! -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <failOnMissingWebXml>false</failOnMissingWebXml>
-
-    <!-- Thorntail dependency versions -->
-    <version.thorntail>2.4.0.Final</version.thorntail>
-
-    <!-- other plugin versions -->
-    <version.compiler.plugin>3.1</version.compiler.plugin>
-    <version.surefire.plugin>2.16</version.surefire.plugin>
-    <version.war.plugin>2.5</version.war.plugin>
-
-    <!-- maven-compiler-plugin -->
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <version.wildfly.swarm>2.1.0.Final</version.wildfly.swarm>
     <maven.compiler.source>1.8</maven.compiler.source>
-
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <failOnMissingWebXml>false</failOnMissingWebXml>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>io.thorntail</groupId>
         <artifactId>bom-all</artifactId>
-        <version>${version.thorntail}</version>
+        <version>${version.wildfly.swarm}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -50,7 +32,7 @@
       <plugin>
         <groupId>io.thorntail</groupId>
         <artifactId>thorntail-maven-plugin</artifactId>
-        <version>${version.thorntail}</version>
+        <version>${version.wildfly.swarm}</version>
         
         <executions>
           <execution>
@@ -64,14 +46,6 @@
   </build>
 
   <dependencies>
-		<dependency>
-			<groupId>io.thorntail</groupId>
-			<artifactId>cdi</artifactId>
-		</dependency>
-    <dependency>
-      <groupId>io.thorntail</groupId>
-      <artifactId>jaxrs</artifactId>
-    </dependency>
     <!-- Java EE 7 dependency -->
     <dependency>
       <groupId>javax</groupId>
@@ -82,4 +56,4 @@
     <!-- WildFly Swarm Fractions -->
     
   </dependencies>
-</project>
+</project>
\ No newline at end of file

From ce90e852f6b259a23f18e715a2ef02952716bdf4 Mon Sep 17 00:00:00 2001
From: Ivan Chavero <ichavero@chavero.com.mx>
Date: Wed, 19 Jun 2019 00:42:25 -0500
Subject: [PATCH 3/5] ch04s04 Update java application for thorntail

---
 java-serverhost/pom.xml                       | 20 +++++++++----------
 .../javaserverhost/rest/RestApplication.java  |  9 +++++++++
 .../rest}/ServerHostEndPoint.java             | 12 ++++++++---
 3 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 java-serverhost/src/main/java/com/redhat/training/example/javaserverhost/rest/RestApplication.java
 rename java-serverhost/src/main/java/com/redhat/training/example/{ => javaserverhost/rest}/ServerHostEndPoint.java (56%)

diff --git a/java-serverhost/pom.xml b/java-serverhost/pom.xml
index 0403048..bdb9d34 100644
--- a/java-serverhost/pom.xml
+++ b/java-serverhost/pom.xml
@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.redhat.training.example</groupId>
   <artifactId>java-serverhost</artifactId>
-  <name>Java Server Host Application</name>
-  <version>1.0</version>
+  <name>Thorntail Example</name>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
   <properties>
-    <version.wildfly.swarm>2.1.0.Final</version.wildfly.swarm>
+    <version.thorntail>2.4.0.Final</version.thorntail>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <failOnMissingWebXml>false</failOnMissingWebXml>
@@ -19,7 +21,7 @@
       <dependency>
         <groupId>io.thorntail</groupId>
         <artifactId>bom-all</artifactId>
-        <version>${version.wildfly.swarm}</version>
+        <version>${version.thorntail}</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -27,12 +29,12 @@
   </dependencyManagement>
 
   <build>
-    <finalName>java-serverhost</finalName>
+    <finalName>demo</finalName>
     <plugins>
       <plugin>
         <groupId>io.thorntail</groupId>
         <artifactId>thorntail-maven-plugin</artifactId>
-        <version>${version.wildfly.swarm}</version>
+        <version>${version.thorntail}</version>
         
         <executions>
           <execution>
@@ -46,14 +48,12 @@
   </build>
 
   <dependencies>
-    <!-- Java EE 7 dependency -->
     <dependency>
       <groupId>javax</groupId>
       <artifactId>javaee-api</artifactId>
       <version>7.0</version>
       <scope>provided</scope>
     </dependency>
-    <!-- WildFly Swarm Fractions -->
     
   </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/java-serverhost/src/main/java/com/redhat/training/example/javaserverhost/rest/RestApplication.java b/java-serverhost/src/main/java/com/redhat/training/example/javaserverhost/rest/RestApplication.java
new file mode 100644
index 0000000..416d4a6
--- /dev/null
+++ b/java-serverhost/src/main/java/com/redhat/training/example/javaserverhost/rest/RestApplication.java
@@ -0,0 +1,9 @@
+package com.redhat.training.example.javaserverhost.rest;
+
+import javax.ws.rs.ApplicationPath;
+import javax.ws.rs.core.Application;
+
+@ApplicationPath("/")
+public class RestApplication extends Application {
+
+}
diff --git a/java-serverhost/src/main/java/com/redhat/training/example/ServerHostEndPoint.java b/java-serverhost/src/main/java/com/redhat/training/example/javaserverhost/rest/ServerHostEndPoint.java
similarity index 56%
rename from java-serverhost/src/main/java/com/redhat/training/example/ServerHostEndPoint.java
rename to java-serverhost/src/main/java/com/redhat/training/example/javaserverhost/rest/ServerHostEndPoint.java
index e09ee8b..a5ff9c1 100644
--- a/java-serverhost/src/main/java/com/redhat/training/example/ServerHostEndPoint.java
+++ b/java-serverhost/src/main/java/com/redhat/training/example/javaserverhost/rest/ServerHostEndPoint.java
@@ -1,4 +1,4 @@
-package com.redhat.training.example.swarmhelloworld.rest;
+package com.redhat.training.example.javaserverhost.rest;
 
 
 import javax.ws.rs.Path;
@@ -13,8 +13,14 @@ public class ServerHostEndPoint {
 
 	@GET
 	@Produces("text/plain")
-	public Response doGet() throws Exception {
-		String host = InetAddress.getLocalHost().getHostName();
+	public Response doGet() {
+		String host = "";
+		try {
+			host = InetAddress.getLocalHost().getHostName();
+		}
+		 catch (Exception e) {
+            e.printStackTrace();
+        }
 		return Response.ok("I am running on server "+host+" Version 1.0 \n").build();
 	}
 }

From 240c81958d9ed1693c367f25efdfc6ae88f28d18 Mon Sep 17 00:00:00 2001
From: Richard Allred <richardmallred@gmail.com>
Date: Wed, 19 Jun 2019 10:41:15 -0400
Subject: [PATCH 4/5] tweaking dependencies for thorntail

---
 java-serverhost/pom.xml | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/java-serverhost/pom.xml b/java-serverhost/pom.xml
index bdb9d34..066f368 100644
--- a/java-serverhost/pom.xml
+++ b/java-serverhost/pom.xml
@@ -14,6 +14,9 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <failOnMissingWebXml>false</failOnMissingWebXml>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <version.compiler.plugin>3.1</version.compiler.plugin>
+		<version.surefire.plugin>2.16</version.surefire.plugin>
+		<version.war.plugin>2.5</version.war.plugin>
   </properties>
 
   <dependencyManagement>
@@ -28,6 +31,18 @@
     </dependencies>
   </dependencyManagement>
 
+  <dependencies>
+		<dependency>
+			<groupId>io.thorntail</groupId>
+			<artifactId>cdi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.thorntail</groupId>
+			<artifactId>jaxrs</artifactId>
+		</dependency>
+
+	</dependencies>
+
   <build>
     <finalName>demo</finalName>
     <plugins>
@@ -46,14 +61,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>javax</groupId>
-      <artifactId>javaee-api</artifactId>
-      <version>7.0</version>
-      <scope>provided</scope>
-    </dependency>
-    
-  </dependencies>
 </project>

From 95e8656462b4d014a28e0f1e7a160e8fa0c53838 Mon Sep 17 00:00:00 2001
From: Richard Allred <richardmallred@gmail.com>
Date: Wed, 19 Jun 2019 14:06:56 -0400
Subject: [PATCH 5/5] revert unnecessary pom changes

---
 java-serverhost/pom.xml | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/java-serverhost/pom.xml b/java-serverhost/pom.xml
index 066f368..4babfa1 100644
--- a/java-serverhost/pom.xml
+++ b/java-serverhost/pom.xml
@@ -14,9 +14,6 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <failOnMissingWebXml>false</failOnMissingWebXml>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.compiler.plugin>3.1</version.compiler.plugin>
-		<version.surefire.plugin>2.16</version.surefire.plugin>
-		<version.war.plugin>2.5</version.war.plugin>
   </properties>
 
   <dependencyManagement>
@@ -31,18 +28,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <dependencies>
-		<dependency>
-			<groupId>io.thorntail</groupId>
-			<artifactId>cdi</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.thorntail</groupId>
-			<artifactId>jaxrs</artifactId>
-		</dependency>
-
-	</dependencies>
-
   <build>
     <finalName>demo</finalName>
     <plugins>
@@ -61,4 +46,5 @@
       </plugin>
     </plugins>
   </build>
+
 </project>