Skip to content

Instantly share code, notes, and snippets.

@stiemannkj1

stiemannkj1/jsf-cdi-applicant-portlet_3.x_4.x.diff Secret

Last active October 13, 2016 12:56
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save stiemannkj1/01b4027d9aa106e7915c0fe66eaba477 to your computer and use it in GitHub Desktop.
Save stiemannkj1/01b4027d9aa106e7915c0fe66eaba477 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
jsf-cdi-applicant-portlet_3.x_4.x.diff
diff --git a/demo/jsf-cdi-applicant-portlet/pom.xml b/demo/jsf-cdi-applicant-portlet/pom.xml
index 4656288..f8436be 100644
--- a/demo/jsf-cdi-applicant-portlet/pom.xml
+++ b/demo/jsf-cdi-applicant-portlet/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.liferay.faces.demo</groupId>
<artifactId>com.liferay.faces.demo.bridge.parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <version>4.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>com.liferay.faces.demo.jsf.cdi.applicant.portlet</artifactId>
@@ -39,11 +39,6 @@
<groupId>com.liferay.faces</groupId>
<artifactId>com.liferay.faces.alloy.reslib</artifactId>
</dependency>
- <dependency>
- <groupId>com.liferay.faces</groupId>
- <artifactId>com.liferay.faces.bridge.cdi.compat</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</profile>
<profile>
@@ -86,7 +81,7 @@
</dependency>
<dependency>
<groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
+ <artifactId>javax.el-api</artifactId>
</dependency>
<dependency>
<groupId>javax.enterprise</groupId>
@@ -97,10 +92,6 @@
<artifactId>portlet-api</artifactId>
</dependency>
<dependency>
- <groupId>com.liferay.cdi</groupId>
- <artifactId>cdi-portlet-bridge-shared</artifactId>
- </dependency>
- <dependency>
<groupId>com.liferay.faces</groupId>
<artifactId>com.liferay.faces.bridge.impl</artifactId>
<version>${project.version}</version>
@@ -110,9 +101,8 @@
<artifactId>com.liferay.faces.alloy</artifactId>
</dependency>
<dependency>
- <groupId>com.liferay.faces</groupId>
- <artifactId>com.liferay.faces.bridge.cdi.weld</artifactId>
- <version>${project.version}</version>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
</dependencies>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/java/com/liferay/faces/demos/bean/ApplicantModelBean.java b/demo/jsf-cdi-applicant-portlet/src/main/java/com/liferay/faces/demos/bean/ApplicantModelBean.java
index 7896372..546efcc 100755
--- a/demo/jsf-cdi-applicant-portlet/src/main/java/com/liferay/faces/demos/bean/ApplicantModelBean.java
+++ b/demo/jsf-cdi-applicant-portlet/src/main/java/com/liferay/faces/demos/bean/ApplicantModelBean.java
@@ -20,8 +20,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.faces.view.ViewScoped;
+import javax.inject.Named;
import com.liferay.faces.bridge.model.UploadedFile;
@@ -32,7 +32,7 @@ import com.liferay.faces.bridge.model.UploadedFile;
* @author "Neil Griffin"
*/
-@ManagedBean
+@Named
@ViewScoped
public class ApplicantModelBean implements Serializable {
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/java/com/liferay/faces/demos/bean/ApplicantViewBean.java b/demo/jsf-cdi-applicant-portlet/src/main/java/com/liferay/faces/demos/bean/ApplicantViewBean.java
index a1be192..c88d309 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/java/com/liferay/faces/demos/bean/ApplicantViewBean.java
+++ b/demo/jsf-cdi-applicant-portlet/src/main/java/com/liferay/faces/demos/bean/ApplicantViewBean.java
@@ -17,15 +17,15 @@ package com.liferay.faces.demos.bean;
import java.io.Serializable;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
import javax.faces.event.ActionEvent;
+import javax.faces.view.ViewScoped;
+import javax.inject.Named;
/**
* @author Neil Griffin
*/
-@ManagedBean
+@Named
@ViewScoped
public class ApplicantViewBean implements Serializable {
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/beans.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/beans.xml
index d8c09ea..552564f 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/beans.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/beans.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee"
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee" bean-discovery-mode="all" version="1.2"
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">
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_2.xsd">
<!-- This file is necessary in order to inform CDI that scanning should occur for CDI annotations. -->
</beans>
\ No newline at end of file
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/faces-config.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/faces-config.xml
index 0cf7186..73d4173 100755
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/faces-config.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<faces-config version="2.1" 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_1.xsd">
+<faces-config version="2.2" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
<application>
<message-bundle>i18nFaces</message-bundle>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/portlet.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/portlet.xml
index eec64f1..198bbc4 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/portlet.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/portlet.xml
@@ -52,15 +52,4 @@
<role-name>user</role-name>
</security-role-ref>
</portlet>
- <filter>
- <filter-name>CDIPortletFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDIPortletFilter</filter-class>
- <lifecycle>ACTION_PHASE</lifecycle>
- <lifecycle>RENDER_PHASE</lifecycle>
- <lifecycle>RESOURCE_PHASE</lifecycle>
- </filter>
- <filter-mapping>
- <filter-name>CDIPortletFilter</filter-name>
- <portlet-name>1</portlet-name>
- </filter-mapping>
</portlet-app>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-geronimo.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-geronimo.xml
index ba9b38b..904a5bf 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-geronimo.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-geronimo.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -41,9 +34,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-glassfish.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-glassfish.xml
index ba9b38b..904a5bf 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-glassfish.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-glassfish.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -41,9 +34,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jboss.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jboss.xml
index ba9b38b..904a5bf 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jboss.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jboss.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -41,9 +34,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jetty.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jetty.xml
index 53beb37..c5fa79a 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jetty.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jetty.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -44,9 +37,6 @@
<listener>
<listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
</listener>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jonas.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jonas.xml
index ba9b38b..904a5bf 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jonas.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-jonas.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -41,9 +34,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-resin.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-resin.xml
index ba9b38b..904a5bf 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-resin.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-resin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -41,9 +34,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-tomcat.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-tomcat.xml
index 53beb37..c5fa79a 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-tomcat.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-tomcat.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -44,9 +37,6 @@
<listener>
<listener-class>org.jboss.weld.environment.servlet.Listener</listener-class>
</listener>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-weblogic.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-weblogic.xml
index ba9b38b..904a5bf 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-weblogic.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-weblogic.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -41,9 +34,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-websphere.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-websphere.xml
index ba9b38b..904a5bf 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-websphere.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web-websphere.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- Set the JSF 2 PROJECT_STAGE to Development so that the JSF implementation will do the following at runtime: -->
<!-- 1. Log more verbose messages. -->
@@ -11,6 +11,10 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.WEBAPP_RESOURCES_DIRECTORY</param-name>
+ <param-value>/WEB-INF/resources</param-value>
+ </context-param>
<!-- Instruct Mojarra to namespace parameters according to NamingContainer rules. -->
<!-- JAVASERVERFACES-3031 -->
<!--
@@ -20,17 +24,6 @@
</context-param>
-->
<filter>
- <filter-name>CDICrossContextFilter</filter-name>
- <filter-class>com.liferay.cdi.portlet.bridge.CDICrossContextFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>CDICrossContextFilter</filter-name>
- <url-pattern>/*</url-pattern>
- <dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
- </filter-mapping>
- <filter>
<filter-name>WeldCrossContextFilter</filter-name>
<filter-class>org.jboss.weld.servlet.WeldCrossContextFilter</filter-class>
</filter>
@@ -41,9 +34,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>ERROR</dispatcher>
</filter-mapping>
- <listener>
- <listener-class>com.liferay.cdi.portlet.bridge.CDIContextListener</listener-class>
- </listener>
<!-- Although the FacesServlet will not be invoked by any portlet requests, it is required to initialize JSF. -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
diff --git a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web.xml b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web.xml
index 4adb4ab..de0a706 100644
--- a/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web.xml
+++ b/demo/jsf-cdi-applicant-portlet/src/main/webapp/WEB-INF/web.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app 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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
<!-- The WEB-INF/web.xml descriptor is required by the maven-war-plugin, but the actual web.xml that -->
<!-- appears in the deployment will be determined by the app.server.type property. For more info, see -->
<!-- the configuration section for the maven-war-plugin in the pom.xml project descriptor. -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment