Weld SVN: r6282 - cdi-tck/trunk/doc/reference/en-US.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 18:22:42 -0400 (Fri, 21 May 2010)
New Revision: 6282
Modified:
cdi-tck/trunk/doc/reference/en-US/configuration.xml
cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml
cdi-tck/trunk/doc/reference/en-US/executing.xml
cdi-tck/trunk/doc/reference/en-US/installation.xml
cdi-tck/trunk/doc/reference/en-US/introduction.xml
Log:
CDITCK-119
Modified: cdi-tck/trunk/doc/reference/en-US/configuration.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/configuration.xml 2010-05-21 22:21:22 UTC (rev 6281)
+++ cdi-tck/trunk/doc/reference/en-US/configuration.xml 2010-05-21 22:22:42 UTC (rev 6282)
@@ -104,7 +104,7 @@
To run the full TCK you must additionally implement
<literal>org.jboss.testharness.spi.Containers</literal>,
which handles deploying the test artifact to the container. An
- implementations of this API is already available for JBoss AS 5.2.
+ implementations of this API is already available for JBoss AS 6.0.
Therefore, you only need to implement this part of the porting package
if you wish to use another container.
</para>
Modified: cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml 2010-05-21 22:21:22 UTC (rev 6281)
+++ cdi-tck/trunk/doc/reference/en-US/eclipse-running.xml 2010-05-21 22:22:42 UTC (rev 6282)
@@ -76,7 +76,7 @@
<para>
<emphasis role="bold">Weld JBoss TCK Runner</emphasis> -
Groups the porting package implementation and TCK runner projects
- that are configured to certify Weld deployed on JBoss AS 5.2
+ that are configured to certify Weld deployed on JBoss AS 6.0
</para>
</listitem>
</orderedlist>
@@ -238,7 +238,7 @@
<para>
Let's see what has to be done to execute an integration test. This
will result in the artifact being deployed to the container, which is
- JBoss AS 5.2 if you are using the JBoss TCK runner.
+ JBoss AS 6.0 if you are using the JBoss TCK runner.
</para>
</section>
<section id="eclipse-in-container">
@@ -275,7 +275,7 @@
- the relative path from the jboss-tck-impl project to a
directory that contains a build.properties or
local.build.properties file defining the location of a JBoss AS
- 5.2 installation in the
+ 6.0 installation in the
<literal>jboss.home</literal>
property
</para>
@@ -373,7 +373,7 @@
</orderedlist>
<para>
When you run the test this time, it should pass. If you get a
- failure that the container (e.g., JBoss AS 5.2) must be run with
+ failure that the container (e.g., JBoss AS 6.0) must be run with
assertions enabled, you need to stop the container and start it with
the -ea flag (or just leave it stopped and the test will start it
appropriately).
Modified: cdi-tck/trunk/doc/reference/en-US/executing.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/executing.xml 2010-05-21 22:21:22 UTC (rev 6281)
+++ cdi-tck/trunk/doc/reference/en-US/executing.xml 2010-05-21 22:22:42 UTC (rev 6282)
@@ -17,7 +17,7 @@
phase of the Maven 2 life cycle. The execution happens within a TCK
runner project (as opposed to the TCK project itself). Weld
includes a TCK runner project that executes the CDI TCK on Weld
- running inside JBoss AS 5.2. To execute the CDI TCK on your own CDI
+ running inside JBoss AS 6.0. To execute the CDI TCK on your own CDI
implementation, you could modify the TCK runner project included with
Weld to use your CDI implementation as described in <xref
linkend="configuration" />.
@@ -88,7 +88,7 @@
deploy the test artifact to the container and execute the test in a
true Java EE life cycle. The JBoss TCK runner has a dependency on the
library that provides an implementation of this interface for JBoss AS
- 5.2.
+ 6.0.
</para>
<para>
Since in-container tests are executed in a remote JVM, the results of
Modified: cdi-tck/trunk/doc/reference/en-US/installation.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/installation.xml 2010-05-21 22:21:22 UTC (rev 6281)
+++ cdi-tck/trunk/doc/reference/en-US/installation.xml 2010-05-21 22:22:42 UTC (rev 6282)
@@ -72,7 +72,7 @@
</listitem>
<listitem>
<para>
- Java EE 6 preview or better (e.g., JBoss AS 5.2.x or GlassFish V3)
+ Java EE 6 preview or better (e.g., JBoss AS 6.0.x or GlassFish V3)
</para>
</listitem>
</itemizedlist>
@@ -150,9 +150,9 @@
Create a file called <literal>local.build.properties</literal>
in <literal>weld/jboss-as</literal> and make sure the
<literal>jboss.home</literal>
- property references a JBoss AS 5.2 installation:
+ property references a JBoss AS 6.0 installation:
</para>
- <programlisting>jboss.home=/path/to/jboss-as-5.2</programlisting>
+ <programlisting>jboss.home=/path/to/jboss-as-6.0</programlisting>
</listitem>
</itemizedlist>
Modified: cdi-tck/trunk/doc/reference/en-US/introduction.xml
===================================================================
--- cdi-tck/trunk/doc/reference/en-US/introduction.xml 2010-05-21 22:21:22 UTC (rev 6281)
+++ cdi-tck/trunk/doc/reference/en-US/introduction.xml 2010-05-21 22:22:42 UTC (rev 6282)
@@ -291,7 +291,7 @@
<itemizedlist>
<listitem>
<para>
- JBoss AS 5.2.0.Beta1 using Sun Java SE 6 on Red Hat Enterprise
+ JBoss AS 6.0 using Sun Java SE 6 on Red Hat Enterprise
Linux 5.2
</para>
</listitem>
13 years, 11 months
Weld SVN: r6281 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 18:21:22 -0400 (Fri, 21 May 2010)
New Revision: 6281
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java
Log:
CDITCK-163
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2010-05-21 22:19:43 UTC (rev 6280)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2010-05-21 22:21:22 UTC (rev 6281)
@@ -44,7 +44,7 @@
{
resp.setContentType("text/text");
SimpleSessionBean aBean = org.jboss.jsr299.tck.impl.OldSPIBridge.getInstanceByType(jsr299Manager,SimpleSessionBean.class);
- resp.getWriter().print(aBean.hashCode());
+ resp.getWriter().print(aBean.getTimestamp());
}
}
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java 2010-05-21 22:19:43 UTC (rev 6280)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java 2010-05-21 22:21:22 UTC (rev 6281)
@@ -27,7 +27,18 @@
private static final long serialVersionUID = 1L;
private static boolean beanDestroyed = false;
+ private final long timestamp;
+ public SimpleSessionBean()
+ {
+ this.timestamp = System.currentTimeMillis();
+ }
+
+ public long getTimestamp()
+ {
+ return timestamp;
+ }
+
@PreDestroy
public void destroyBean()
{
13 years, 11 months
Weld SVN: r6280 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation: simple/resource/resource and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 18:19:43 -0400 (Fri, 21 May 2010)
New Revision: 6280
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
Log:
CDITCK-162
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2010-05-21 22:17:34 UTC (rev 6279)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2010-05-21 22:19:43 UTC (rev 6280)
@@ -84,9 +84,10 @@
// Verify that the instance returned is a proxy by checking for all local interfaces
assert getCurrentConfiguration().getBeans().isProxy(stadtInstance);
- assert stadtInstance instanceof KleinStadt;
- assert stadtInstance instanceof SchoeneStadt;
- assert stadtInstance instanceof Serializable;
+ Set<Class> interfaces = new HashSet<Class>(Arrays.asList(stadtInstance.getClass().getInterfaces()));
+ assert interfaces.contains(KleinStadt.class);
+ assert interfaces.contains(SchoeneStadt.class);
+ assert interfaces.contains(Serializable.class);
}
@Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2010-05-21 22:17:34 UTC (rev 6279)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2010-05-21 22:19:43 UTC (rev 6280)
@@ -47,7 +47,6 @@
CreationalContext<ManagedBean> managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean);
ManagedBean managedBean = managedBeanBean.create(managedBeanCc);
assert managedBean.getBeanManager() != null : "@Another Manager not found";
- assert managedBean.getBeanManager().equals(getCurrentManager()): "Wrong manager found";
}
@Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" })
@@ -62,7 +61,6 @@
CreationalContext<BeanManager> beanManagerCc = getCurrentManager().createCreationalContext(beanManagerBean);
BeanManager beanManager = beanManagerBean.create(beanManagerCc);
assert beanManager != null;
- assert beanManager.equals(getCurrentManager());
}
@Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" })
13 years, 11 months
Weld SVN: r6278 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 18:17:03 -0400 (Fri, 21 May 2010)
New Revision: 6278
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
Log:
CDITCK-160
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2010-05-21 22:16:24 UTC (rev 6277)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2010-05-21 22:17:03 UTC (rev 6278)
@@ -42,12 +42,9 @@
@SpecAssertion(section = "3.12", id = "l")
public void testNewBeanHasSameConstructor()
{
- ExplicitConstructor bean = getInstanceByType(ExplicitConstructor.class);
- bean.setConstructorCalls(0);
ExplicitConstructor newBean = getInstanceByType(ExplicitConstructor.class, ExplicitConstructorSessionBean.NEW);
- assert bean != newBean;
- assert bean.getConstructorCalls() == 1;
- assert bean.getInjectedSimpleBean() != null;
+ assert newBean.getConstructorCalls() == 1;
+ assert newBean.getInjectedSimpleBean() != null;
}
@Test(groups = { "new" })
13 years, 11 months
Weld SVN: r6277 - cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 18:16:24 -0400 (Fri, 21 May 2010)
New Revision: 6277
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java
Log:
CDITCK-161
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java 2010-05-21 21:55:46 UTC (rev 6276)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/SimpleBean.java 2010-05-21 22:16:24 UTC (rev 6277)
@@ -16,7 +16,7 @@
*/
package org.jboss.jsr299.tck.tests.implementation.enterprise.definition;
-class SimpleBean
+public class SimpleBean
{
}
13 years, 11 months
Weld SVN: r6276 - in core/trunk/impl/src/main/java/org/jboss/weld: servlet and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 17:55:46 -0400 (Fri, 21 May 2010)
New Revision: 6276
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java
core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java
Log:
put conversation stuff in the same place
Modified: core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2010-05-21 21:54:29 UTC (rev 6275)
+++ core/trunk/impl/src/main/java/org/jboss/weld/context/ContextLifecycle.java 2010-05-21 21:55:46 UTC (rev 6276)
@@ -325,9 +325,15 @@
activateConversationContext();
}
+ /**
+ * Tear down the conversation context. If the context is already destroyed, does nothing
+ */
public void teardownConversationContext()
{
- destroyConversationContext();
+ if (getConversationContext().getBeanStore() != null)
+ {
+ destroyConversationContext();
+ }
}
public boolean isSessionContextActive()
Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2010-05-21 21:54:29 UTC (rev 6275)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/ServletLifecycle.java 2010-05-21 21:55:46 UTC (rev 6276)
@@ -197,6 +197,10 @@
private void teardownConversation()
{
conversationManager(getServletContext()).teardownConversation();
+ if (isSessionBeanStoreInvalid(getSessionBeanStore()))
+ {
+ conversationManager(getServletContext()).teardownContext();
+ }
}
private ServletContext getServletContext()
@@ -209,7 +213,6 @@
HttpPassThruSessionBeanStore sessionBeanStore = getSessionBeanStore();
if (isSessionBeanStoreInvalid(sessionBeanStore))
{
- conversationManager(getServletContext()).teardownContext();
lifecycle.endSession(request.getRequestedSessionId(), sessionBeanStore);
}
lifecycle.deactivateSessionContext();
13 years, 11 months
Weld SVN: r6275 - core/trunk/impl/src/main/java/org/jboss/weld/conversation.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 17:54:29 -0400 (Fri, 21 May 2010)
New Revision: 6275
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java
Log:
minor reuse change
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-05-21 21:53:37 UTC (rev 6274)
+++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/AbstractConversationManager.java 2010-05-21 21:54:29 UTC (rev 6275)
@@ -26,8 +26,8 @@
import static org.jboss.weld.logging.messages.ConversationMessage.DESTROY_LRC;
import static org.jboss.weld.logging.messages.ConversationMessage.LRC_COUNT;
import static org.jboss.weld.logging.messages.ConversationMessage.NO_CONVERSATION_TO_RESTORE;
+import static org.jboss.weld.logging.messages.ConversationMessage.SWITCHING_MODE_RESETS_TIMEOUTS;
import static org.jboss.weld.logging.messages.ConversationMessage.UNABLE_TO_RESTORE_CONVERSATION;
-import static org.jboss.weld.logging.messages.ConversationMessage.SWITCHING_MODE_RESETS_TIMEOUTS;
import java.io.Serializable;
import java.util.Collections;
@@ -237,7 +237,7 @@
private void endTransientConversation()
{
- getConversationContext().destroy();
+ getContextLifeCycle().teardownConversationContext();
if (conversation.getResumedId() != null)
{
getBeanStore(conversation.getResumedId()).clear();
13 years, 11 months
Weld SVN: r6274 - cdi-tck/branches/1.0/impl/src/main/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 17:53:37 -0400 (Fri, 21 May 2010)
New Revision: 6274
Modified:
cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml
Log:
Oops, wrong test! CDITCK-162
Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml
===================================================================
--- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-05-21 21:53:29 UTC (rev 6273)
+++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-05-21 21:53:37 UTC (rev 6274)
@@ -180,7 +180,7 @@
<class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest">
<methods>
<exclude name="testInjectionOfResource" />
- <exclude name="testPassivatingResource" />
+ <exclude name="testProduceResourceProxy" />
</methods>
</class>
13 years, 11 months
Weld SVN: r6273 - core/trunk/jboss-tck-runner/src/test/resources.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2010-05-21 17:53:29 -0400 (Fri, 21 May 2010)
New Revision: 6273
Modified:
core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
Log:
Oops, wrong test! CDITCK-162
Modified: core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml
===================================================================
--- core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-05-21 20:50:19 UTC (rev 6272)
+++ core/trunk/jboss-tck-runner/src/test/resources/tck-tests.xml 2010-05-21 21:53:29 UTC (rev 6273)
@@ -17,6 +17,22 @@
<!-- Issues in the TCK -->
+ <!-- CDITCK-162 -->
+ <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest">
+ <methods>
+ <exclude name="testInjectionOfResource" />
+ <exclude name="testProduceResourceProxy" />
+ </methods>
+ </class>
+
+ <!-- CDITCK-163 -->
+ <class name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest">
+ <methods>
+ <exclude name="testSessionContextDestroyedWhenHttpSessionInvalidated" />
+ <exclude name="testSessionContextDestroyedWhenHttpSessionTimesOut" />
+ </methods>
+ </class>
+
<!-- Issues in Weld (the RI) -->
<!-- WELD-401 -->
13 years, 11 months