From a156cf6d0a93a2002f37756d20a989e3851b42ef Mon Sep 17 00:00:00 2001
From: Alex Aquino <alexaquino.it@gmail.com>
Date: Tue, 2 Oct 2018 22:49:28 -0300
Subject: [PATCH 1/2] Migrate JSF managed beans (deprecated) to CDI managed
 beans

---
 .DS_Store                         | Bin 0 -> 6148 bytes
 pom.xml                           |  78 ++++++++++++++++--------------
 src/main/java/bean/HelloBean.java |  11 +++--
 src/main/webapp/WEB-INF/beans.xml |   0
 4 files changed, 47 insertions(+), 42 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 src/main/webapp/WEB-INF/beans.xml

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..7e0abc2f3769922bfc32ad0e7d84fb944bd02810
GIT binary patch
literal 6148
zcmeHKO;5r=5Pb_6F<v-&>>tp^f6x&0Knw?sccEaS7O4FYj{WJr*&T=oUOX6LX2{H&
zosVVrm2_DEu3t~DfgXS^Rj_qNb3i07x+g7-oDiL#V~shoyqetA<zBS~j*$U*cBja(
z<deI?m*-a%%nb2}5;GLEF~-Q~uZi!d@qz`rVhm_gj_1rRQ2ELsZgGzhvoq#0*5-bm
z7%Ns6c;hJNJSp=ry@JtKUt8gl-WVTL@k%@sSIkWq$@z&7u6R_Je#PJR!rC_HD3DIe
zG@C4!86%re_@N&4Ms@LA>1Kl(k!_e51IB<c@LL9WW{Y&s1DZ7ki~(a{%YeKeBC24b
z*aY;i4jO+2Aa)q`LSOC@(i15ricLUfC@!=TL#xv(h70YCM_QLCHUUFBoL)YhezVgX
ziu2#j`6FKrmjpCx3>X8u479_rC+Gjo&-ee`CL0+8#=yT~z;y->gFd&UXY1bP<gAUT
rPgD`9YXWXt==h_UwQ>|+P`xl7i9<{jn}Cc^?2mw_!HhBRrwn`o&y{6J

literal 0
HcmV?d00001

diff --git a/pom.xml b/pom.xml
index 13de472..1729f88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft</groupId>
@@ -8,39 +7,44 @@
 	<packaging>war</packaging>
 	<name>Sample JSF App</name>
 	
-<!-- JSF Dependency -->
-  <dependencies>
-    <dependency>
-        <groupId>com.sun.faces</groupId>
-        <artifactId>jsf-api</artifactId>
-        <version>2.2.14</version>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.faces</groupId>
-        <artifactId>jsf-impl</artifactId>
-        <version>2.2.14</version>
-    </dependency>
-    <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>3.1.0</version>
-    </dependency>
-</dependencies>
-  
-  <!-- Build Maven WAR -->
-<build>
-<finalName>ROOT</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.2</version>
-        <configuration>
-          <!-- Java version -->
-          <source>1.8</source>
-          <target>1.8</target>
-        </configuration>
-      </plugin>
-    </plugins>   
-  </build>
+	<!-- JSF Dependency -->
+	<dependencies>
+	    <dependency>
+	        <groupId>com.sun.faces</groupId>
+	        <artifactId>jsf-api</artifactId>
+	        <version>2.2.14</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>com.sun.faces</groupId>
+	        <artifactId>jsf-impl</artifactId>
+	        <version>2.2.14</version>
+	    </dependency>
+	    <dependency>
+	        <groupId>javax.servlet</groupId>
+	        <artifactId>javax.servlet-api</artifactId>
+	        <version>3.1.0</version>
+	    </dependency>
+  		<!-- CDI Dependency -->
+		<dependency>
+		    <groupId>org.jboss.weld.servlet</groupId>
+		    <artifactId>weld-servlet-shaded</artifactId>
+		    <version>3.0.5.Final</version>
+		</dependency>
+  	</dependencies>
+  	<!-- Build Maven WAR -->
+	<build>
+	<finalName>ROOT</finalName>
+	<plugins>
+		<plugin>
+	    	<groupId>org.apache.maven.plugins</groupId>
+	        <artifactId>maven-compiler-plugin</artifactId>
+	        <version>3.6.2</version>
+	        <configuration>
+	        	<!-- Java version -->
+	          	<source>1.8</source>
+	          	<target>1.8</target>
+	        </configuration>
+	    </plugin>
+	</plugins>   
+	</build>
 </project>
diff --git a/src/main/java/bean/HelloBean.java b/src/main/java/bean/HelloBean.java
index bfcc377..80b1c5d 100644
--- a/src/main/java/bean/HelloBean.java
+++ b/src/main/java/bean/HelloBean.java
@@ -2,17 +2,18 @@
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
+import javax.enterprise.context.SessionScoped;
+import javax.inject.Named;
 
-@ManagedBean
+@Named
 @SessionScoped
-public class HelloBean  implements Serializable{
+public class HelloBean implements Serializable {
 
 	private static final long serialVersionUID = -4823295172962937652L;
 	
 	private String message = "Your Java app is up and running on Azure";
-
+	
+	
 	public String getMessage() {
 		return message;
 	}
diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml
new file mode 100644
index 0000000..e69de29

From d98fdb799e15672d6bfe2fbc9b3108b524e776d2 Mon Sep 17 00:00:00 2001
From: Alex Aquino <alex.aquino@tum.de>
Date: Tue, 2 Oct 2018 22:50:34 -0300
Subject: [PATCH 2/2] Delete .DS_Store

---
 .DS_Store | Bin 6148 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 7e0abc2f3769922bfc32ad0e7d84fb944bd02810..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKO;5r=5Pb_6F<v-&>>tp^f6x&0Knw?sccEaS7O4FYj{WJr*&T=oUOX6LX2{H&
zosVVrm2_DEu3t~DfgXS^Rj_qNb3i07x+g7-oDiL#V~shoyqetA<zBS~j*$U*cBja(
z<deI?m*-a%%nb2}5;GLEF~-Q~uZi!d@qz`rVhm_gj_1rRQ2ELsZgGzhvoq#0*5-bm
z7%Ns6c;hJNJSp=ry@JtKUt8gl-WVTL@k%@sSIkWq$@z&7u6R_Je#PJR!rC_HD3DIe
zG@C4!86%re_@N&4Ms@LA>1Kl(k!_e51IB<c@LL9WW{Y&s1DZ7ki~(a{%YeKeBC24b
z*aY;i4jO+2Aa)q`LSOC@(i15ricLUfC@!=TL#xv(h70YCM_QLCHUUFBoL)YhezVgX
ziu2#j`6FKrmjpCx3>X8u479_rC+Gjo&-ee`CL0+8#=yT~z;y->gFd&UXY1bP<gAUT
rPgD`9YXWXt==h_UwQ>|+P`xl7i9<{jn}Cc^?2mw_!HhBRrwn`o&y{6J