[weld-commits] [weld/core] 3174f4: WELD-1657 Backport WELD-1452

[GitHub]

  Branch: refs/heads/eap6.2.x
  Home:   https://github.com/weld/core
  Commit: 3174f4227c89802ae6724fb2052360cee3cb87c6
      https://github.com/weld/core/commit/3174f4227c89802ae6724fb2052360cee3cb87c6
  Author: Martin Kouba <mkouba at redhat.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M bom/pom.xml
    M build-config/pom.xml
    M bundles/osgi/pom.xml
    M docs/reference/pom.xml
    M environments/se/build/pom.xml
    M environments/se/core/pom.xml
    M environments/servlet/build/pom.xml
    M environments/servlet/core/pom.xml
    M environments/servlet/pom.xml
    M environments/servlet/tests/base/pom.xml
    M environments/servlet/tests/jetty/pom.xml
    M environments/servlet/tests/jetty7/pom.xml
    M environments/servlet/tests/tomcat/pom.xml
    M environments/servlet/tests/tomcat7/pom.xml
    M examples/jsf/login/pom.xml
    M examples/jsf/numberguess/pom.xml
    M examples/jsf/pastecode/pom.xml
    M examples/jsf/permalink/pom.xml
    M examples/jsf/translator/ear/pom.xml
    M examples/jsf/translator/ejb/pom.xml
    M examples/jsf/translator/ftest/pom.xml
    M examples/jsf/translator/pom.xml
    M examples/jsf/translator/war/pom.xml
    M examples/pom.xml
    M examples/se/hello-world/pom.xml
    M examples/se/numberguess/pom.xml
    M impl/pom.xml
    M impl/src/main/java/org/jboss/weld/context/AbstractConversationContext.java
    M inject-tck-runner/pom.xml
    M jboss-as/jboss-as-6/pom.xml
    M jboss-as/jboss-as-7/pom.xml
    M jboss-tck-runner/pom.xml
    M pom.xml
    M porting-package/pom.xml
    M tests-arquillian/pom.xml
    A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/ConversationTimeoutTest.java
    A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutController.java
    A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutConversationScopedBean.java
    A tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/conversation/timeout/TimeoutFilter.java
    A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/faces-config.xml
    A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/form.xhtml
    A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/test.xhtml
    A tests-arquillian/src/test/resources/org/jboss/weld/tests/contexts/conversation/timeout/web.xml
    M tests/pom.xml

  Log Message:
  -----------
  WELD-1657 Backport WELD-1452