[weld-commits] Weld SVN: r5727 - in core/trunk: impl/src/main/java/org/jboss/weld/conversation and 5 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Thu Feb 4 13:30:12 EST 2010
Author: pete.muir at jboss.org
Date: 2010-02-04 13:30:11 -0500 (Thu, 04 Feb 2010)
New Revision: 5727
Added:
core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java
core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/
core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ClientConversationContextTest.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/Cloud.java
core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ConversationTestPhaseListener.java
core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/
core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/.faces-config.xml.jsfdia
core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/cloud.jsf
core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/faces-config.xml
core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/web.xml
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java
core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java
Log:
WELD-387
Added: core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.context;
+
+import org.jboss.weld.exceptions.WeldExceptionMessage;
+
+/**
+ * A localized message version of the
+ * {@link javax.enterprise.context.NonexistentConversationException}.
+ *
+ * @author David Allen
+ */
+public class BusyConversationException extends javax.enterprise.context.BusyConversationException
+{
+
+ private static final long serialVersionUID = 2L;
+
+ private WeldExceptionMessage message;
+
+ public BusyConversationException(Throwable throwable)
+ {
+ super(throwable.getLocalizedMessage(), throwable);
+ }
+
+ public <E extends Enum<?>> BusyConversationException(E key, Object... args)
+ {
+ message = new WeldExceptionMessage(key, args);
+ }
+
+ @Override
+ public String getLocalizedMessage()
+ {
+ return getMessage();
+ }
+
+ @Override
+ public String getMessage()
+ {
+ return message.getAsString();
+ }
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/context/BusyConversationException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java (rev 0)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.weld.context;
+
+import org.jboss.weld.exceptions.WeldExceptionMessage;
+
+/**
+ * A localized message version of the
+ * {@link javax.enterprise.context.NonexistentConversationException}.
+ *
+ * @author David Allen
+ */
+public class NonexistentConversationException extends javax.enterprise.context.NonexistentConversationException
+{
+
+ private static final long serialVersionUID = 2L;
+
+ private WeldExceptionMessage message;
+
+ public NonexistentConversationException(Throwable throwable)
+ {
+ super(throwable.getLocalizedMessage(), throwable);
+ }
+
+ public <E extends Enum<?>> NonexistentConversationException(E key, Object... args)
+ {
+ message = new WeldExceptionMessage(key, args);
+ }
+
+ @Override
+ public String getLocalizedMessage()
+ {
+ return getMessage();
+ }
+
+ @Override
+ public String getMessage()
+ {
+ return message.getAsString();
+ }
+}
Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/context/NonexistentConversationException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java 2010-02-04 16:58:35 UTC (rev 5726)
+++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java 2010-02-04 18:30:11 UTC (rev 5727)
@@ -49,8 +49,10 @@
import javax.inject.Inject;
import org.jboss.weld.Container;
+import org.jboss.weld.context.BusyConversationException;
import org.jboss.weld.context.ContextLifecycle;
import org.jboss.weld.context.ConversationContext;
+import org.jboss.weld.context.NonexistentConversationException;
import org.jboss.weld.context.api.BeanStore;
import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory;
import org.slf4j.cal10n.LocLogger;
@@ -102,8 +104,7 @@
// We got an incoming conversation ID but it was not in the map of
// known ones, nothing to do. Log and return to continue with a
// transient conversation
- log.warn(UNABLE_TO_RESTORE_CONVERSATION, cid, "id not known");
- return;
+ throw new NonexistentConversationException(UNABLE_TO_RESTORE_CONVERSATION, cid, "id not known");
}
ConversationEntry resumedConversationEntry = longRunningConversations.get(cid);
// Try to get a lock to the requested conversation, log and return to
@@ -112,14 +113,13 @@
{
if (!resumedConversationEntry.lock(concurrentAccessTimeout))
{
- return;
+ throw new BusyConversationException(CONVERSATION_LOCK_UNAVAILABLE);
}
}
catch (InterruptedException e)
{
- log.debug(CONVERSATION_LOCK_UNAVAILABLE);
Thread.currentThread().interrupt();
- return;
+ throw new BusyConversationException(CONVERSATION_LOCK_UNAVAILABLE);
}
// If we can't cancel the termination, release the lock, return and
// continue
@@ -127,6 +127,7 @@
if (!resumedConversationEntry.cancelTermination())
{
resumedConversationEntry.unlock();
+ throw new BusyConversationException(CONVERSATION_LOCK_UNAVAILABLE);
}
else
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2010-02-04 16:58:35 UTC (rev 5726)
+++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/WeldPhaseListener.java 2010-02-04 18:30:11 UTC (rev 5727)
@@ -163,15 +163,21 @@
private void initiateSessionAndConversation(FacesContext facesContext)
{
ServletContext servletContext = getServletContext(facesContext);
+ AbstractConversationManager conversationManager = (AbstractConversationManager) conversationManager(servletContext);
HttpSession session = getHttpSession(facesContext);
httpSessionManager(servletContext).setSession(session);
- AbstractConversationManager conversationManager = (AbstractConversationManager) conversationManager(servletContext);
- conversationManager.beginOrRestoreConversation(getConversationId(facesContext));
- String cid = conversation(servletContext).getUnderlyingId();
-
- ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
- conversationContext.setBeanStore(conversationManager.getBeanStore(cid));
- conversationContext.setActive(true);
+ try
+ {
+ conversationManager.beginOrRestoreConversation(getConversationId(facesContext));
+ }
+ finally
+ {
+ String cid = conversation(servletContext).getUnderlyingId();
+
+ ConversationContext conversationContext = Container.instance().services().get(ContextLifecycle.class).getConversationContext();
+ conversationContext.setBeanStore(conversationManager.getBeanStore(cid));
+ conversationContext.setActive(true);
+ }
}
/**
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ClientConversationContextTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ClientConversationContextTest.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ClientConversationContextTest.java 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,77 @@
+package org.jboss.weld.tests.contexts.conversation;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Classes;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.war.WebXml;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+import com.gargoylesoftware.htmlunit.Page;
+import com.gargoylesoftware.htmlunit.WebClient;
+
+/**
+ * @author Nicklas Karlsson
+ * @author Dan Allen
+ */
+ at Artifact(addCurrentPackage = false)
+ at Classes( { ConversationTestPhaseListener.class, Cloud.class })
+ at IntegrationTest(runLocally = true)
+ at Resources( {
+ @Resource(destination = "cloud.jspx", source = "cloud.jsf"),
+ @Resource(destination="/WEB-INF/faces-config.xml", source="faces-config.xml")
+})
+ at WebXml("web.xml")
+public class ClientConversationContextTest extends AbstractWeldTest
+{
+
+ public static final String CID_REQUEST_PARAMETER_NAME = "cid";
+
+ public static final String CID_HEADER_NAME = "org.jboss.jsr299.tck.cid";
+
+ public static final String LONG_RUNNING_HEADER_NAME = "org.jboss.jsr299.tck.longRunning";
+
+ @Test(groups = { "contexts" })
+ public void testConversationPropagationToNonExistentConversationLeadsException() throws Exception
+ {
+ WebClient client = new WebClient();
+ client.setThrowExceptionOnFailingStatusCode(false);
+ Page page = client.getPage(getPath("/cloud.jsf", "org.jboss.jsr299"));
+ assert page.getWebResponse().getStatusCode() == 500;
+ }
+
+ protected Boolean isLongRunning(Page page)
+ {
+ return Boolean.valueOf(page.getWebResponse().getResponseHeaderValue(LONG_RUNNING_HEADER_NAME));
+ }
+
+ protected String getPath(String viewId, String cid)
+ {
+ return getContextPath() + viewId + "?" + CID_REQUEST_PARAMETER_NAME + "=" + cid;
+ }
+
+ protected String getCid(Page page)
+ {
+ return page.getWebResponse().getResponseHeaderValue(CID_HEADER_NAME);
+ }
+
+}
\ No newline at end of file
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ClientConversationContextTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/Cloud.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/Cloud.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/Cloud.java 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.tests.contexts.conversation;
+
+import java.io.Serializable;
+
+import javax.annotation.PreDestroy;
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.Default;
+import javax.inject.Named;
+
+ at Named @Default
+ at ConversationScoped
+public class Cloud implements Serializable
+{
+ /**
+ *
+ */
+ private static final long serialVersionUID = 5765109971012677278L;
+
+ public static final String NAME = Cloud.class.getName() + ".Pete";
+
+ public static final String RAINED_HEADER_NAME = Cloud.class.getName() + ".rained";
+
+ private static boolean destroyed = false;
+
+ private boolean rained;
+
+ @PreDestroy
+ public void destroy()
+ {
+ destroyed = true;
+ }
+
+ public static boolean isDestroyed()
+ {
+ return destroyed;
+ }
+
+ public static void setDestroyed(boolean destroyed)
+ {
+ Cloud.destroyed = destroyed;
+ }
+
+ public String getName()
+ {
+ return NAME;
+ }
+
+ public void rain()
+ {
+ rained = true;
+ System.out.println("rain!");
+ }
+
+ public boolean isRained()
+ {
+ return rained;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/Cloud.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ConversationTestPhaseListener.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ConversationTestPhaseListener.java (rev 0)
+++ core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ConversationTestPhaseListener.java 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.tests.contexts.conversation;
+
+import javax.enterprise.context.ContextNotActiveException;
+import javax.enterprise.context.Conversation;
+import javax.enterprise.context.ConversationScoped;
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.servlet.http.HttpServletResponse;
+
+import org.jboss.weld.jsf.JsfHelper;
+import org.jboss.weld.manager.BeanManagerImpl;
+import org.jboss.weld.servlet.ServletHelper;
+import org.jboss.weld.test.Utils;
+
+public class ConversationTestPhaseListener implements PhaseListener
+{
+
+ public static final String CID_REQUEST_PARAMETER_NAME = "cid";
+
+ public static final String CID_HEADER_NAME = "org.jboss.jsr299.tck.cid";
+
+ public static final String LONG_RUNNING_HEADER_NAME = "org.jboss.jsr299.tck.longRunning";
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1197355854770726526L;
+
+ public static final String ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME = "org.jboss.jsr299.tck.activeBeforeApplyRequestValues";
+
+ private boolean activeBeforeApplyRequestValues;
+
+ public void afterPhase(PhaseEvent event)
+ {
+ }
+
+ public void beforePhase(PhaseEvent event)
+ {
+ BeanManagerImpl beanManager = ServletHelper.getModuleBeanManager(JsfHelper.getServletContext(event.getFacesContext()));
+ if (event.getPhaseId().equals(PhaseId.APPLY_REQUEST_VALUES))
+ {
+ try
+ {
+ beanManager.getContext(ConversationScoped.class);
+ activeBeforeApplyRequestValues = true;
+ }
+ catch (ContextNotActiveException e)
+ {
+ activeBeforeApplyRequestValues = false;
+ }
+ }
+ if (event.getPhaseId().equals(PhaseId.RENDER_RESPONSE))
+ {
+ Conversation conversation = Utils.getReference(beanManager, Conversation.class);
+ HttpServletResponse response = (HttpServletResponse) event.getFacesContext().getExternalContext().getResponse();
+ response.addHeader(CID_HEADER_NAME, conversation.getId() == null ? " null" : conversation.getId());
+ response.addHeader(LONG_RUNNING_HEADER_NAME, String.valueOf(!conversation.isTransient()));
+ response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(Utils.getReference(beanManager, Cloud.class).isRained()).toString());
+ response.addHeader(ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME, new Boolean(activeBeforeApplyRequestValues).toString());
+ }
+ }
+
+ public PhaseId getPhaseId()
+ {
+ return PhaseId.ANY_PHASE;
+ }
+
+}
Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/contexts/conversation/ConversationTestPhaseListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/.faces-config.xml.jsfdia
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/.faces-config.xml.jsfdia (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/.faces-config.xml.jsfdia 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<PROCESS model-entity="JSFProcess"/>
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/cloud.jsf
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/cloud.jsf (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/cloud.jsf 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns="http://www.w3.org/1999/xhtml"
+ version="2.0">
+ <jsp:output doctype-root-element="html"
+ doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+ doctype-system="http://www.w3c.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+ <jsp:directive.page contentType="text/html"/>
+ <html>
+ <head>
+ </head>
+ <body>
+ <f:view>
+ <h:outputText value="#{cloud.name}" id="cloudName" />
+ </f:view>
+ </body>
+ </html>
+</jsp:root>
+
Property changes on: core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/cloud.jsf
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/faces-config.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/faces-config.xml (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/faces-config.xml 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<faces-config version="1.2"
+ 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">
+
+ <lifecycle>
+ <phase-listener>org.jboss.weld.tests.contexts.conversation.ConversationTestPhaseListener</phase-listener>
+ </lifecycle>
+
+</faces-config>
Property changes on: core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/web.xml
===================================================================
--- core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/web.xml (rev 0)
+++ core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/web.xml 2010-02-04 18:30:11 UTC (rev 5727)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<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">
+
+ <display-name>JSR-299 TCK</display-name>
+
+ <!-- JSF -->
+
+ <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>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.jspx</param-value>
+ </context-param>
+
+ <listener>
+ <listener-class>org.jboss.testharness.impl.runner.servlet.HarnessServletListener</listener-class>
+ </listener>
+
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
+
+</web-app>
Property changes on: core/trunk/tests/src/test/resources/org/jboss/weld/tests/contexts/conversation/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
More information about the weld-commits
mailing list