From 98fbb50879fe84463b96c607f439fe50f88bb5b6 Mon Sep 17 00:00:00 2001
From: Slavisa Baeldung <slavisa.baeldung@gmail.com>
Date: Thu, 26 May 2016 11:25:11 +0200
Subject: [PATCH] jsf-spring-integration - cleaning up (cherry picked from
 commit 3d6aa91)

---
 .../main/webapp/WEB-INF/applicationContext.xml  |  4 ++--
 jsf/src/main/webapp/WEB-INF/async_config.xml    | 11 -----------
 jsf/src/main/webapp/WEB-INF/beans.xml           |  5 -----
 jsf/src/main/webapp/WEB-INF/faces-config.xml    | 17 +++--------------
 jsf/src/main/webapp/WEB-INF/glassfish-web.xml   | 10 ----------
 5 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 jsf/src/main/webapp/WEB-INF/async_config.xml
 delete mode 100644 jsf/src/main/webapp/WEB-INF/beans.xml
 delete mode 100644 jsf/src/main/webapp/WEB-INF/glassfish-web.xml

diff --git a/jsf/src/main/webapp/WEB-INF/applicationContext.xml b/jsf/src/main/webapp/WEB-INF/applicationContext.xml
index 385a0b8680..5d162f56ba 100644
--- a/jsf/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/jsf/src/main/webapp/WEB-INF/applicationContext.xml
@@ -9,7 +9,7 @@
           http://www.springframework.org/schema/lang/spring-lang-2.5.xsd http://www.springframework.org/schema/lang/spring-lang-2.5.xsd/spring-spring-lang-2.5.xsd-3.1.1.RELEASE.xsd
 ">
 
-    <bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor" />
+    <bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
     <bean class="com.baeldung.springintegration.dao.UserManagementDAOImpl" id="userManagementDAO"/>
-    
+
 </beans>
diff --git a/jsf/src/main/webapp/WEB-INF/async_config.xml b/jsf/src/main/webapp/WEB-INF/async_config.xml
deleted file mode 100644
index 600a279086..0000000000
--- a/jsf/src/main/webapp/WEB-INF/async_config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<bindings
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-    wsdlLocation="http://localhost:8084/AxiaTest/TestIt?wsdl"
-    xmlns="http://java.sun.com/xml/ns/jaxws">
-    <bindings node="wsdl:definitions">
-        <package name="com.me.transport.test"/>
-        <enableAsyncMapping>true</enableAsyncMapping>
-       
-    </bindings>
-</bindings>
\ No newline at end of file
diff --git a/jsf/src/main/webapp/WEB-INF/beans.xml b/jsf/src/main/webapp/WEB-INF/beans.xml
deleted file mode 100644
index 4ca8195bea..0000000000
--- a/jsf/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans 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/beans_1_0.xsd">
-</beans>
diff --git a/jsf/src/main/webapp/WEB-INF/faces-config.xml b/jsf/src/main/webapp/WEB-INF/faces-config.xml
index 69baa5b05a..e9e6404b95 100644
--- a/jsf/src/main/webapp/WEB-INF/faces-config.xml
+++ b/jsf/src/main/webapp/WEB-INF/faces-config.xml
@@ -10,7 +10,7 @@
     <application>
         <resource-bundle>
             <base-name>
-               messages
+                messages
             </base-name>
             <var>
                 msg
@@ -26,7 +26,7 @@
         </resource-bundle>
         <el-resolver>org.springframework.web.jsf.el.SpringBeanFacesELResolver</el-resolver>
     </application>
-  
+
     <navigation-rule>
         <from-view-id>/*</from-view-id>
         <navigation-case>
@@ -35,16 +35,5 @@
             <redirect/>
         </navigation-case>
     </navigation-rule>
-        
-    <navigation-rule>
-        <from-view-id>/register.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>review registration</from-outcome>
-            <to-view-id>/review_registration.xhtml</to-view-id>
-            <redirect/>
-        </navigation-case>
-    </navigation-rule>
-    
- 
-    
+
 </faces-config>
diff --git a/jsf/src/main/webapp/WEB-INF/glassfish-web.xml b/jsf/src/main/webapp/WEB-INF/glassfish-web.xml
deleted file mode 100644
index 13e0059fff..0000000000
--- a/jsf/src/main/webapp/WEB-INF/glassfish-web.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<glassfish-web-app error-url="">
-  <class-loader delegate="true"/>
-  <jsp-config>
-    <property name="keepgenerated" value="true">
-      <description>Keep a copy of the generated servlet class' java code.</description>
-    </property>
-  </jsp-config>
-</glassfish-web-app>