Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

LPS-28057 LPS-28058 LPS-28060 LPS-28061 LPS-28062 Source formatting

  • Loading branch information...
commit 303f7e1056e9e7a94ffe131cc605587c3dd454c6 1 parent 42d7075
@brianchandotcom brianchandotcom authored
View
30 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>
View
13 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>
View
18 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>
View
10 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>
View
4 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
+log4j.logger.com.liferay.faces.bridge.lifecycle.BridgeDebugPhaseListener=DEBUG
+log4j.logger.com.liferay.sample=DEBUG
View
13 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>
View
15 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>
View
16 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>
View
16 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>
View
13 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>
View
16 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>
Please sign in to comment.
Something went wrong with that request. Please try again.