diff --git a/portlets/build.xml b/portlets/build.xml
index a04c854c4534..e53b9c1fae01 100644
--- a/portlets/build.xml
+++ b/portlets/build.xml
@@ -80,6 +80,7 @@
 								</copy>
 							</then>
 						</if>
+
 						<copy overwrite="true" todir="${portlet.dir}">
 							<fileset
 								dir="${project.dir}/tools/portlet_${portlet.framework}_tmpl"
@@ -90,27 +91,32 @@
 
 				<if>
 					<or>
-						<equals arg1="${portlet.framework}" arg2="jsf" />
 						<equals arg1="${portlet.framework}" arg2="icefaces" />
+						<equals arg1="${portlet.framework}" arg2="jsf" />
 						<equals arg1="${portlet.framework}" arg2="liferay_faces_alloy" />
 						<equals arg1="${portlet.framework}" arg2="primefaces" />
 						<equals arg1="${portlet.framework}" arg2="richfaces" />
 					</or>
 					<then>
-						<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">
-
-portal-dependency-jars=commons-beanutils.jar,commons-collections.jar,commons-digester.jar,commons-lang.jar</echo>
 						<if>
-							<not>
-								<equals arg1="${portlet.framework}" arg2="icefaces" />
-							</not>
+							<equals arg1="${portlet.framework}" arg2="icefaces" />
 							<then>
-								<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">,commons-io.jar,commons-fileupload.jar</echo>
+								<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">
+
+portal-dependency-jars=commons-beanutils.jar,commons-collections.jar,commons-digester.jar,commons-fileupload.jar,commons-io.jar,commons-lang.jar
+
+speed-filters-enabled=false
+								</echo>
 							</then>
-						</if>
-						<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">
+							<else>
+								<echo file="${portlet.dir}/docroot/WEB-INF/liferay-plugin-package.properties" append="true">
+
+portal-dependency-jars=commons-beanutils.jar,commons-collections.jar,commons-digester.jar,commons-lang.jar
 
-speed-filters-enabled=false</echo>
+speed-filters-enabled=false
+								</echo>
+							</else>
+						</if>
 
 						<replace file="${portlet.dir}/docroot/WEB-INF/liferay-portlet.xml">
 							<replacetoken><![CDATA[</instanceable>]]></replacetoken>
@@ -221,4 +227,4 @@ portal-dependency-jars=vaadin.jar</echo>
 			</else>
 		</if>
 	</target>
-</project>
+</project>
\ No newline at end of file
diff --git a/tools/portlet_icefaces_tmpl/docroot/WEB-INF/web.xml b/tools/portlet_icefaces_tmpl/docroot/WEB-INF/web.xml
index 5472ea07ecb4..0044e53fc7d0 100644
--- a/tools/portlet_icefaces_tmpl/docroot/WEB-INF/web.xml
+++ b/tools/portlet_icefaces_tmpl/docroot/WEB-INF/web.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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"
-	version="2.5">
-
+>
 	<context-param>
 		<param-name>com.sun.faces.expressionFactory</param-name>
 		<param-value>org.jboss.el.ExpressionFactoryImpl</param-value>
@@ -25,5 +27,4 @@
 		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-
-</web-app>
+</web-app>
\ No newline at end of file
diff --git a/tools/portlet_icefaces_tmpl/docroot/views/view.xhtml b/tools/portlet_icefaces_tmpl/docroot/views/view.xhtml
index 4377271c7798..4662781a3e4e 100644
--- a/tools/portlet_icefaces_tmpl/docroot/views/view.xhtml
+++ b/tools/portlet_icefaces_tmpl/docroot/views/view.xhtml
@@ -1,10 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:view xmlns="http://www.w3.org/1999/xhtml" xmlns:ace="http://www.icefaces.org/icefaces/components"
-	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html" xmlns:icecore="http://www.icefaces.org/icefaces/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ace="http://www.icefaces.org/icefaces/components"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:icecore="http://www.icefaces.org/icefaces/core"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
 	<h:head />
 	<h:body>
 		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
 	</h:body>
-</f:view>
+</f:view>
\ No newline at end of file
diff --git a/tools/portlet_jsf_tmpl/docroot/WEB-INF/faces-config.xml b/tools/portlet_jsf_tmpl/docroot/WEB-INF/faces-config.xml
index 6e42a6c1ac25..f89d218a1e09 100644
--- a/tools/portlet_jsf_tmpl/docroot/WEB-INF/faces-config.xml
+++ b/tools/portlet_jsf_tmpl/docroot/WEB-INF/faces-config.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
+
 <faces-config
+    version="2.0"
     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-facesconfig_2_0.xsd"
-    version="2.0">
-
+>
 	<lifecycle>
 		<phase-listener>com.liferay.faces.bridge.lifecycle.BridgeDebugPhaseListener</phase-listener>
 	</lifecycle>
-
-</faces-config>
+</faces-config>
\ No newline at end of file
diff --git a/tools/portlet_jsf_tmpl/docroot/WEB-INF/src/log4j.properties b/tools/portlet_jsf_tmpl/docroot/WEB-INF/src/log4j.properties
index d028f64b399e..df0c84296f6e 100644
--- a/tools/portlet_jsf_tmpl/docroot/WEB-INF/src/log4j.properties
+++ b/tools/portlet_jsf_tmpl/docroot/WEB-INF/src/log4j.properties
@@ -4,5 +4,5 @@ log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
 log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
 log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}:%L] %m%n
 
-log4j.logger.com.liferay.sample=DEBUG
-log4j.logger.com.liferay.faces.bridge.lifecycle.BridgeDebugPhaseListener=DEBUG
\ No newline at end of file
+log4j.logger.com.liferay.faces.bridge.lifecycle.BridgeDebugPhaseListener=DEBUG
+log4j.logger.com.liferay.sample=DEBUG
\ No newline at end of file
diff --git a/tools/portlet_jsf_tmpl/docroot/WEB-INF/web.xml b/tools/portlet_jsf_tmpl/docroot/WEB-INF/web.xml
index 0093e1ce56fe..2602df3cf5ca 100644
--- a/tools/portlet_jsf_tmpl/docroot/WEB-INF/web.xml
+++ b/tools/portlet_jsf_tmpl/docroot/WEB-INF/web.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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"
-	version="2.5">
-
+>
 	<context-param>
 		<param-name>com.sun.faces.expressionFactory</param-name>
 		<param-value>org.jboss.el.ExpressionFactoryImpl</param-value>
@@ -17,5 +19,4 @@
 		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-
-</web-app>
+</web-app>
\ No newline at end of file
diff --git a/tools/portlet_jsf_tmpl/docroot/views/view.xhtml b/tools/portlet_jsf_tmpl/docroot/views/view.xhtml
index 5662ed7e28ef..a2c535967f7c 100644
--- a/tools/portlet_jsf_tmpl/docroot/views/view.xhtml
+++ b/tools/portlet_jsf_tmpl/docroot/views/view.xhtml
@@ -1,9 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:view xmlns="http://www.w3.org/1999/xhtml" xmlns:c="http://java.sun.com/jsp/jstl/core"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
 	<h:head />
 	<h:body>
 		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
 	</h:body>
-</f:view>
+</f:view>
\ No newline at end of file
diff --git a/tools/portlet_liferay_faces_alloy_tmpl/docroot/views/view.xhtml b/tools/portlet_liferay_faces_alloy_tmpl/docroot/views/view.xhtml
index 4419ca6831d6..98cd44002603 100644
--- a/tools/portlet_liferay_faces_alloy_tmpl/docroot/views/view.xhtml
+++ b/tools/portlet_liferay_faces_alloy_tmpl/docroot/views/view.xhtml
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:view xmlns="http://www.w3.org/1999/xhtml" xmlns:aui="http://liferay.com/faces/aui"
-	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets">
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:aui="http://liferay.com/faces/aui"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
 	<h:head />
 	<h:body>
 		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
 	</h:body>
-</f:view>
+</f:view>
\ No newline at end of file
diff --git a/tools/portlet_primefaces_tmpl/docroot/views/view.xhtml b/tools/portlet_primefaces_tmpl/docroot/views/view.xhtml
index 18868cb22fa0..aa6e886b08c6 100644
--- a/tools/portlet_primefaces_tmpl/docroot/views/view.xhtml
+++ b/tools/portlet_primefaces_tmpl/docroot/views/view.xhtml
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:view xmlns="http://www.w3.org/1999/xhtml" xmlns:c="http://java.sun.com/jsp/jstl/core"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:p="http://primefaces.org/ui" xmlns:ui="http://java.sun.com/jsf/facelets">
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
 	<h:head />
 	<h:body>
 		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
 	</h:body>
-</f:view>
+</f:view>
\ No newline at end of file
diff --git a/tools/portlet_richfaces_tmpl/docroot/WEB-INF/web.xml b/tools/portlet_richfaces_tmpl/docroot/WEB-INF/web.xml
index 592363c96a9b..33c14d6a31bc 100644
--- a/tools/portlet_richfaces_tmpl/docroot/WEB-INF/web.xml
+++ b/tools/portlet_richfaces_tmpl/docroot/WEB-INF/web.xml
@@ -1,9 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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"
-	version="2.5">
-
+>
 	<context-param>
 		<param-name>com.sun.faces.expressionFactory</param-name>
 		<param-value>org.jboss.el.ExpressionFactoryImpl</param-value>
@@ -30,5 +32,4 @@
 		<servlet-name>Resource Servlet</servlet-name>
 		<url-pattern>/org.richfaces.resources/*</url-pattern>
 	</servlet-mapping>
-
-</web-app>
+</web-app>
\ No newline at end of file
diff --git a/tools/portlet_richfaces_tmpl/docroot/views/view.xhtml b/tools/portlet_richfaces_tmpl/docroot/views/view.xhtml
index e76cef2b5b6b..d47378b195b3 100644
--- a/tools/portlet_richfaces_tmpl/docroot/views/view.xhtml
+++ b/tools/portlet_richfaces_tmpl/docroot/views/view.xhtml
@@ -1,9 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:view xmlns="http://www.w3.org/1999/xhtml" xmlns:c="http://java.sun.com/jsp/jstl/core"
-	xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:rich="http://richfaces.org/rich" xmlns:ui="http://java.sun.com/jsf/facelets">
+<?xml version="1.0"?>
+
+<f:view
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:rich="http://richfaces.org/rich"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+>
 	<h:head />
 	<h:body>
 		<h:outputText value="#{i18n['@portlet.name@-hello-world']}" />
 	</h:body>
-</f:view>
+</f:view>
\ No newline at end of file