You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/11/18 21:24:25 UTC
svn commit: r881922 - in /incubator/openwebbeans/trunk: ./
samples/ejb-sample/src/main/webapp/WEB-INF/
samples/ejb-telephone/src/main/webapp/WEB-INF/
samples/guess/src/main/webapp/WEB-INF/
samples/jms-sample/src/main/webapp/WEB-INF/ samples/jsf2sample/...
Author: gerdogdu
Date: Wed Nov 18 20:24:24 2009
New Revision: 881922
URL: http://svn.apache.org/viewvc?rev=881922&view=rev
Log:
Add JSF view handler for conversation as a default
Modified:
incubator/openwebbeans/trunk/pom.xml
incubator/openwebbeans/trunk/samples/ejb-sample/src/main/webapp/WEB-INF/web.xml
incubator/openwebbeans/trunk/samples/ejb-telephone/src/main/webapp/WEB-INF/web.xml
incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml
incubator/openwebbeans/trunk/samples/jms-sample/src/main/webapp/WEB-INF/web.xml
incubator/openwebbeans/trunk/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml
incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/faces-config.xml
incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/common/ConversationDecorator.java
incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/JSFConversationServiceImpl.java
incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java
Modified: incubator/openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/pom.xml?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/pom.xml (original)
+++ incubator/openwebbeans/trunk/pom.xml Wed Nov 18 20:24:24 2009
@@ -521,6 +521,26 @@
<version>${openwebbeans.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-resource</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-geronimo</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-ejb</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+
<dependency>
<groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-jpa</artifactId>
Modified: incubator/openwebbeans/trunk/samples/ejb-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/ejb-sample/src/main/webapp/WEB-INF/web.xml?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/ejb-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/openwebbeans/trunk/samples/ejb-sample/src/main/webapp/WEB-INF/web.xml Wed Nov 18 20:24:24 2009
@@ -25,14 +25,6 @@
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
- <filter>
- <filter-name>webbeans</filter-name>
- <filter-class>org.apache.webbeans.jsf.WebBeansJSFFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>webbeans</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
<listener>
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
</listener>
Modified: incubator/openwebbeans/trunk/samples/ejb-telephone/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/ejb-telephone/src/main/webapp/WEB-INF/web.xml?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/ejb-telephone/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/openwebbeans/trunk/samples/ejb-telephone/src/main/webapp/WEB-INF/web.xml Wed Nov 18 20:24:24 2009
@@ -25,14 +25,6 @@
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
- <filter>
- <filter-name>webbeans</filter-name>
- <filter-class>org.apache.webbeans.jsf.WebBeansJSFFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>webbeans</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
<listener>
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
</listener>
Modified: incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/openwebbeans/trunk/samples/guess/src/main/webapp/WEB-INF/web.xml Wed Nov 18 20:24:24 2009
@@ -28,10 +28,6 @@
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
</listener>
- <filter>
- <filter-name>webbeans</filter-name>
- <filter-class>org.apache.webbeans.jsf.WebBeansJSFFilter</filter-class>
- </filter>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -41,10 +37,6 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
- <filter-mapping>
- <filter-name>webbeans</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
Modified: incubator/openwebbeans/trunk/samples/jms-sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/jms-sample/src/main/webapp/WEB-INF/web.xml?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/jms-sample/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/openwebbeans/trunk/samples/jms-sample/src/main/webapp/WEB-INF/web.xml Wed Nov 18 20:24:24 2009
@@ -28,23 +28,16 @@
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
</listener>
- <filter>
- <filter-name>webbeans</filter-name>
- <filter-class>org.apache.webbeans.jsf.WebBeansJSFFilter</filter-class>
- </filter>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
+
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
- <filter-mapping>
- <filter-name>webbeans</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
Modified: incubator/openwebbeans/trunk/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/openwebbeans/trunk/samples/jsf2sample/src/main/webapp/WEB-INF/web.xml Wed Nov 18 20:24:24 2009
@@ -29,11 +29,6 @@
org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
</listener>
- <filter>
- <filter-name>webbeans</filter-name>
- <filter-class>org.apache.webbeans.jsf.WebBeansJSFFilter</filter-class>
- </filter>
-
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -45,9 +40,4 @@
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
- <filter-mapping>
- <filter-name>webbeans</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
-
</web-app>
\ No newline at end of file
Modified: incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml Wed Nov 18 20:24:24 2009
@@ -25,14 +25,6 @@
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
<param-value>.xhtml</param-value>
</context-param>
- <filter>
- <filter-name>webbeans</filter-name>
- <filter-class>org.apache.webbeans.jsf.WebBeansJSFFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>webbeans</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
<listener>
<listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
</listener>
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Wed Nov 18 20:24:24 2009
@@ -70,6 +70,7 @@
else
{
logger.warn("Conversation with cid=" + id + " is already began!");
+ throw new IllegalStateException();
}
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Wed Nov 18 20:24:24 2009
@@ -754,7 +754,7 @@
conversationComp.setType(new StandardLiteral());
conversationComp.addQualifier(new DefaultLiteral());
conversationComp.addQualifier(new AnyLiteral());
- conversationComp.setName("javax.context.conversation");
+ conversationComp.setName("javax.enterprise.context.conversation");
WebBeansDecoratorConfig.configureDecarotors(conversationComp);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/faces-config.xml?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/faces-config.xml (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/META-INF/faces-config.xml Wed Nov 18 20:24:24 2009
@@ -17,19 +17,14 @@
specific language governing permissions and limitations
under the License.
-->
-<faces-config
- 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_1_2.xsd"
- version="1.2">
-
- <application>
- <el-resolver>org.apache.webbeans.el.WebBeansELResolver</el-resolver>
- </application>
-
- <lifecycle>
- <phase-listener>org.apache.webbeans.jsf.WebBeansPhaseListener</phase-listener>
- </lifecycle>
-
-
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ 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_1_2.xsd">
+ <application>
+ <view-handler>org.apache.webbeans.jsf.ConversationAwareViewHandler</view-handler>
+ <el-resolver>org.apache.webbeans.el.WebBeansELResolver</el-resolver>
+ </application>
+ <lifecycle>
+ <phase-listener>org.apache.webbeans.jsf.WebBeansPhaseListener</phase-listener>
+ </lifecycle>
</faces-config>
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/common/ConversationDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/common/ConversationDecorator.java?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/common/ConversationDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/decorators/common/ConversationDecorator.java Wed Nov 18 20:24:24 2009
@@ -26,9 +26,8 @@
@Override
public void begin()
- {
+ {
CALLED = true;
- conversation.begin();
}
@Override
Modified: incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/JSFConversationServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/JSFConversationServiceImpl.java?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/JSFConversationServiceImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/spi/conversation/jsf/JSFConversationServiceImpl.java Wed Nov 18 20:24:24 2009
@@ -26,7 +26,16 @@
public String getConversationId()
{
- return JSFUtil.getConversationId();
+ //For postback conversation
+ String cid = JSFUtil.getConversationId();
+
+ if(cid == null)
+ {
+ //For GET conversation
+ cid = JSFUtil.getJSFRequestParameter("cid");
+ }
+
+ return cid;
}
public String getConversationSessionId()
Modified: incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java?rev=881922&r1=881921&r2=881922&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-jsf/src/main/java/org/apache/webbeans/util/JSFUtil.java Wed Nov 18 20:24:24 2009
@@ -147,6 +147,18 @@
return null;
}
+
+
+ public static String getJSFRequestParameter(String parameterName)
+ {
+ ExternalContext ec = getExternalContext();
+ if(ec != null)
+ {
+ return ec.getRequestParameterMap().get(parameterName);
+ }
+
+ return null;
+ }
public static String getConversationId()
{