[webbeans-commits] Webbeans SVN: r3087 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-19 09:31:12 -0400 (Sun, 19 Jul 2009)
New Revision: 3087
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java
Log:
matched transactional observer tests to assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-19 12:58:11 UTC (rev 3086)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/transactionalObservers/EventTest.java 2009-07-19 13:31:12 UTC (rev 3087)
@@ -37,7 +37,7 @@
*
* @author David Allen
*
- * Spec version: Public Release Draft 2
+ * Spec version: 20090625
*
*/
@Artifact
@@ -72,7 +72,7 @@
// }
@Test(groups = { "events", "integration" })
- @SpecAssertion(section = "7.5.6", id = "a")
+ @SpecAssertion(section = "10.4.5", id = "a")
public void testTransactionalObserverNotifiedImmediatelyWhenNoTransactionInProgress()
{
dog.setCorrectContext(false);
@@ -86,7 +86,7 @@
}
@Test(groups = { "events", "integration", "broken" })
- @SpecAssertions( { @SpecAssertion(section = "7.5.6", id = "c"), @SpecAssertion(section = "7.5.6", id = "i"), @SpecAssertion(section = "7.5.8", id = "d"), @SpecAssertion(section = "7.5.8", id = "f") })
+ @SpecAssertions( { @SpecAssertion(section = "10.4.5", id = "c"), @SpecAssertion(section = "7.5.6", id = "i"), @SpecAssertion(section = "7.5.8", id = "d"), @SpecAssertion(section = "7.5.8", id = "f") })
public void testAfterTransactionCompletionObserver() throws InterruptedException
{
dog.setCorrectContext(false);
@@ -99,9 +99,7 @@
}
@Test(groups = { "events", "integration", "broken" })
- @SpecAssertions( {
- @SpecAssertion(section = "7.5.6", id = "d"),
- @SpecAssertion(section = "7.5.6", id = "j") })
+ @SpecAssertion(section = "10.4.5", id = "d")
public void testAfterTransactionSuccessObserver() throws InterruptedException
{
dog.setCorrectContext(false);
@@ -113,9 +111,7 @@
}
@Test(groups = { "events", "integration", "ri-broken" })
- @SpecAssertions( {
- @SpecAssertion(section = "7.5.6", id = "e"),
- @SpecAssertion(section = "7.5.6", id = "k") })
+ @SpecAssertion(section = "10.4.5", id = "e")
public void testAfterTransactionFailureObserver() throws InterruptedException
{
dog.setCorrectContext(false);
@@ -128,9 +124,8 @@
@Test(groups = { "events", "integration", "broken" })
@SpecAssertions( {
- @SpecAssertion(section = "7.5.6", id = "b"),
- @SpecAssertion(section = "7.5.6", id = "h"),
- @SpecAssertion(section = "7.5.8", id = "e") })
+ @SpecAssertion(section = "10.4.5", id = "b"),
+ @SpecAssertion(section = "10.4.5", id = "e") })
public void testBeforeTransactionCompletionObserver()
{
dog.setCorrectContext(false);
@@ -142,15 +137,8 @@
// assert dog.isCorrectContext();
}
- @Test(groups = { "stub", "events", "integration" })
- @SpecAssertions( { @SpecAssertion(section = "7.5.6", id = "g") })
- public void testTransactionalObserverDefinedByXML()
- {
- assert false;
- }
-
@Test(groups = { "events", "ri-broken" })
- @SpecAssertion(section = "7.5.7", id = "c")
+ @SpecAssertion(section = "review", id = "review") // the spec now only mentions asynchronous observer methods in passing
public void testAsynchronousObserverAlsoTransactional() throws InterruptedException
{
dog.setCorrectContext(false);
@@ -168,7 +156,7 @@
* completion phase.
*/
@Test(groups = { "stub", "events" })
- @SpecAssertion(section = "7.5.8", id = "e")
+ @SpecAssertion(section = "review", id = "review")
public void testAsynchronousTransactionalObserverCalledAfterCompletion()
{
assert false;
@@ -180,7 +168,7 @@
* Event.fire().
*/
@Test(groups = { "stub", "events", "integration" })
- @SpecAssertion(section = "7.5.9", id = "d")
+ @SpecAssertion(section = "10.5.1", id = "da")
public void testObserverMethodCalledInSameContexts()
{
assert false;
@@ -193,7 +181,7 @@
* context and lifecycle contexts.
*/
@Test(groups = { "stub", "events", "integration" })
- @SpecAssertion(section = "7.5.9", id = "b")
+ @SpecAssertion(section = "10.5.1", id = "ba")
public void testBeforeTransactionCompletionObserverMethodContexts()
{
assert false;
@@ -206,14 +194,14 @@
* transaction that just completed.
*/
@Test(groups = { "stub", "events", "integration" })
- @SpecAssertion(section = "7.5.9", id = "c")
+ @SpecAssertion(section = "10.5.1", id = "c")
public void testOtherTransactionalObserverMethodContexts()
{
assert false;
}
@Test(groups = { "events", "integration" })
- @SpecAssertion(section = "7.4", id = "d")
+ @SpecAssertion(section = "10.5", id = "bd")
public void testObserverCanSetRollbackOnlyOnTransaction()
{
Agent dogAgent = getInstanceByType(Agent.class);
@@ -221,7 +209,7 @@
}
@Test(groups = { "ri-broken", "events", "integration" }, expectedExceptions = EJBException.class)
- @SpecAssertion(section = "7.4", id = "e")
+ @SpecAssertion(section = "10.5", id = "bd")
public void testObserverCannotInitiateJtaTransaction()
{
Agent dogAgent = getInstanceByType(Agent.class);
@@ -229,7 +217,7 @@
}
@Test(groups = { "ri-broken", "events", "integration" }, expectedExceptions = EJBException.class)
- @SpecAssertion(section = "7.4", id = "f")
+ @SpecAssertion(section = "10.5", id = "bd")
public void testObserverCannotCommitJtaTransaction()
{
Agent dogAgent = getInstanceByType(Agent.class);
@@ -237,7 +225,7 @@
}
@Test(groups = { "ri-broken", "events", "integration" }, expectedExceptions = EJBException.class)
- @SpecAssertion(section = "7.4", id = "g")
+ @SpecAssertion(section = "10.5", id = "bd")
public void testObserverCannotRollbackJtaTransaction()
{
Agent dogAgent = getInstanceByType(Agent.class);
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3086 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple: lifecycle and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-07-19 08:58:11 -0400 (Sun, 19 Jul 2009)
New Revision: 3086
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
Log:
matched simple bean tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-17 22:13:08 UTC (rev 3085)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-07-19 12:58:11 UTC (rev 3086)
@@ -10,7 +10,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -19,8 +19,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.2.1", id = "ca"),
- @SpecAssertion(section = "3.2", id = "ca")
+ @SpecAssertion(section = "3.1.1", id = "ca"),
+ @SpecAssertion(section = "3.1", id = "ca")
})
public void testAbstractClassDeclaredInJavaNotDiscovered()
{
@@ -29,7 +29,7 @@
@Test(groups = "innerClass")
@SpecAssertions({
- @SpecAssertion(section = "3.2.1", id = "ba")
+ @SpecAssertion(section = "3.1.1", id = "ba")
})
public void testStaticInnerClassDeclaredInJavaAllowed()
{
@@ -38,7 +38,7 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.2.1", id = "b")
+ @SpecAssertion(section = "3.1.1", id = "b")
})
public void testNonStaticInnerClassDeclaredInJavaNotDiscovered()
{
@@ -46,7 +46,7 @@
}
@Test
- @SpecAssertion(section = "3.2.1", id = "cb")
+ @SpecAssertion(section = "3.1.1", id = "cb")
public void testInterfaceNotDiscoveredAsSimpleBean()
{
assert getBeans(Car.class).size() == 0;
@@ -64,14 +64,14 @@
// }
@Test
- @SpecAssertion(section="3.2.1", id="f")
+ @SpecAssertion(section="3.1.1", id="f")
public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean()
{
assert getBeans(MockEnterpriseBean.class).size() == 0;
}
@Test
- @SpecAssertion(section="3.2.1", id="p")
+ @SpecAssertion(section="3.1.1", id="p")
public void testSimpleBeanOnlyIfConstructorParameterless()
{
assert getBeans(Antelope_NotBean.class).isEmpty();
@@ -79,7 +79,7 @@
}
@Test
- @SpecAssertion(section="3.2.1", id="q")
+ @SpecAssertion(section="3.1.1", id="q")
public void testSimpleBeanOnlyIfConstructorIsInitializer()
{
assert getBeans(Antelope_NotBean.class).isEmpty();
@@ -87,7 +87,7 @@
}
@Test
- @SpecAssertion(section = "3.2.4.1", id = "a")
+ @SpecAssertion(section = "3.1.4.1", id = "a")
public void testInitializerAnnotatedConstructor() throws Exception
{
new RunInDependentContext()
@@ -106,10 +106,8 @@
@Test
@SpecAssertions({
- @SpecAssertion(section = "3.2.5", id = "a"),
- @SpecAssertion(section = "3.2.4.1", id = "ba"),
- @SpecAssertion(section = "3.1", id = "a"),
- @SpecAssertion(section = "3.2.3", id = "a")
+ @SpecAssertion(section = "3.1.4.1", id = "ba"),
+ @SpecAssertion(section = "3.1.3", id = "a")
})
public void testEmptyConstructorUsed()
{
@@ -119,7 +117,7 @@
}
@Test
- @SpecAssertion(section = "3.2.4.1", id = "a")
+ @SpecAssertion(section = "3.1.4.1", id = "a")
public void testInitializerAnnotatedConstructorUsedOverEmptyConstuctor() throws Exception
{
new RunInDependentContext()
@@ -134,7 +132,7 @@
}
@Test
- @SpecAssertion(section = "3.2", id = "fa")
+ @SpecAssertion(section = "3.1", id = "fa")
public void testDependentScopedBeanCanHavePublicField() throws Exception
{
new RunInDependentContext()
@@ -147,7 +145,5 @@
}
}.run();
-
}
-
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-17 22:13:08 UTC (rev 3085)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-07-19 12:58:11 UTC (rev 3086)
@@ -22,7 +22,7 @@
/**
*
- * Spec version: 20090519
+ * Spec version: 20090625
*
*/
@Artifact
@@ -35,8 +35,8 @@
@Test(groups = "beanConstruction")
@SpecAssertions({
- @SpecAssertion(section = "3.2.4.2", id = "b"),
- @SpecAssertion(section = "3.2.4.2", id = "c"),
+ @SpecAssertion(section = "3.1.4.2", id = "b"),
+ @SpecAssertion(section = "3.1.4.2", id = "c"),
@SpecAssertion(section = "2.3.5", id = "d")
})
public void testInjectionOfParametersIntoBeanConstructor()
@@ -48,7 +48,7 @@
}
@Test
- @SpecAssertion(section = "3.2.4.2", id = "b")
+ @SpecAssertion(section = "3.1.4.2", id = "b")
public void testBindingTypeAnnotatedConstructor() throws Exception
{
new RunInDependentContext()
@@ -63,7 +63,7 @@
}
@Test(groups = { "specialization" })
- @SpecAssertion(section = "3.2.5", id = "aa")
+ @SpecAssertion(section = "3.1.5", id = "aa")
public void testSpecializedBeanAlwaysUsed() throws Exception
{
new RunInDependentContext()
@@ -80,7 +80,7 @@
@Test(groups = "beanLifecycle")
@SpecAssertions({
- @SpecAssertion(section = "6.1.1", id = "c"),
+ @SpecAssertion(section = "6.1.1", id = "ca"),
@SpecAssertion(section = "6.1.1", id = "d"),
@SpecAssertion(section = "6.1.1", id = "e")
})
@@ -107,10 +107,9 @@
@Test(groups = "beanLifecycle")
@SpecAssertions({
- @SpecAssertion(section = "6.1.1", id = "a"),
@SpecAssertion(section="2", id="g"),
@SpecAssertion(section="2.2.1", id="b"),
- @SpecAssertion(section="3.2.6", id="a"),
+ @SpecAssertion(section="3.1.6", id="a"),
@SpecAssertion(section = "7", id = "d")
})
public void testCreateReturnsInstanceOfBean()
@@ -121,8 +120,8 @@
@Test(groups = "injection")
@SpecAssertions({
- @SpecAssertion(section = "7.2", id = "c"),
- @SpecAssertion(section = "3.8.1", id = "a")
+ @SpecAssertion(section = "7.3.1", id = "c"),
+ @SpecAssertion(section = "3.7.1", id = "a")
})
public void testCreateInjectsFieldsDeclaredInJava()
{
@@ -146,8 +145,8 @@
@Test(groups = { "beanLifecycle", "lifecycleCallbacks" })
@SpecAssertions({
- @SpecAssertion(section = "7.2", id = "d"),
- @SpecAssertion(section = "7.2", id = "e")
+ @SpecAssertion(section = "review", id = "review"), // no longer explicit in the spec?
+ @SpecAssertion(section = "review", id = "review")
})
public void testPostConstructPreDestroy() throws Exception
{
@@ -164,7 +163,7 @@
@Test(groups = { "beanLifecycle", "lifecycleCallbacks" })
@SpecAssertions({
- @SpecAssertion(section = "6.1.2", id = "a")
+ @SpecAssertion(section = "review", id = "review") // removed from the spec?
})
public void testContextualDestroyDisposesWhenNecessary() throws Exception
{
@@ -180,7 +179,7 @@
@Test(groups = "beanLifecycle")
@SpecAssertions({
- @SpecAssertion(section = "6.1.2", id = "a")
+ @SpecAssertion(section = "review", id = "review") // removed from the spec?
})
public void testContextualDestroyCatchesException()
{
@@ -193,8 +192,7 @@
@Test(groups = "beanLifecycle")
@SpecAssertions({
- @SpecAssertion(section = "6.1.2", id = "a"),
- @SpecAssertion(section = "6.4.3", id = "a")
+ @SpecAssertion(section = "review", id = "review") // removed from spec?
})
public void testDependentsDestroyedAfterPreDestroy()
{
@@ -318,7 +316,7 @@
}
@Test(expectedExceptions = CreationException.class)
- @SpecAssertion(section = "6.1.1", id = "b")
+ @SpecAssertion(section = "review", id = "review") // removed from spec?
public void testCreationExceptionWrapsCheckedExceptionThrownFromCreate() throws Exception
{
assert getBeans(Lorry_Broken.class).size() == 1;
@@ -335,7 +333,7 @@
}
@Test(expectedExceptions = FooException.class)
- @SpecAssertion(section = "6.1.1", id = "b")
+ @SpecAssertion(section = "review", id = "review") // removed from spec?
public void testUncheckedExceptionThrownFromCreateNotWrapped() throws Exception
{
assert getBeans(Van_Broken.class).size() == 1;
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3085 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating: broken11 and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-17 18:13:08 -0400 (Fri, 17 Jul 2009)
New Revision: 3085
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/British.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Cow.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/CowProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/MaarianHaminaLocal_Broken.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Maarianhamina_Broken.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java
Log:
break out test for IllegalProductException when attempt to inject non-serializable result of producer method into passivation capable bean
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/British.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/British.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/British.java 2009-07-17 22:13:08 UTC (rev 3085)
@@ -0,0 +1,20 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken11;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.enterprise.inject.BindingType;
+
+
+@BindingType
+@Target({TYPE, METHOD, FIELD})
+@Retention(RUNTIME)
+@interface British
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Cow.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Cow.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Cow.java 2009-07-17 22:13:08 UTC (rev 3085)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken11;
+
+class Cow
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/CowProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/CowProducer.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/CowProducer.java 2009-07-17 22:13:08 UTC (rev 3085)
@@ -0,0 +1,14 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken11;
+
+import javax.enterprise.inject.Produces;
+
+public class CowProducer
+{
+
+ @Produces @British
+ public Cow produce()
+ {
+ return new Cow();
+ }
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/EnterpriseBeanWithIllegalDependencyTest.java 2009-07-17 22:13:08 UTC (rev 3085)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken11;
+
+import javax.enterprise.inject.IllegalProductException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.IntegrationTest;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.testng.annotations.Test;
+
+@Artifact
+@IntegrationTest
+(a)Packaging(PackagingType.EAR)
+(a)ExpectedDeploymentException(IllegalProductException.class)
+public class EnterpriseBeanWithIllegalDependencyTest extends AbstractJSR299Test
+{
+ @Test(groups = { "contexts", "passivation", "integration"})
+ @SpecAssertion(section = "6.6.4", id = "f")
+ public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails()
+ {
+ assert false;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/MaarianHaminaLocal_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/MaarianHaminaLocal_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/MaarianHaminaLocal_Broken.java 2009-07-17 22:13:08 UTC (rev 3085)
@@ -0,0 +1,9 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken11;
+
+import javax.ejb.Local;
+
+@Local
+public interface MaarianHaminaLocal_Broken
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Maarianhamina_Broken.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Maarianhamina_Broken.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken11/Maarianhamina_Broken.java 2009-07-17 22:13:08 UTC (rev 3085)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken11;
+
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
+
+@Stateful
+public class Maarianhamina_Broken implements MaarianHaminaLocal_Broken
+{
+ @SuppressWarnings("unused")
+ @British Cow cow;
+
+ @Remove
+ public void bye() {
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java 2009-07-17 22:12:13 UTC (rev 3084)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/integration/PassivatingContextIntegrationTest.java 2009-07-17 22:13:08 UTC (rev 3085)
@@ -25,28 +25,6 @@
assert false;
}
- @Test(groups = { "contexts", "passivation", "integration"})
- @SpecAssertion(section = "8.4", id = "p")
- public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoStatefulSessionBeanFails() throws SecurityException, NoSuchMethodException
- {
- try
- {
- getInstanceByType(MaarianHaminaLocal_Broken.class);
- }
- catch (Throwable e)
- {
- while (!e.getClass().equals(Throwable.class))
- {
- if (e.getClass().equals(IllegalProductException.class))
- {
- return;
- }
- e = e.getCause();
- }
- assert false;
- }
- }
-
/**
* the Web Bean is an EJB stateful session bean, and it is passivated by the
* EJB container.
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3084 - tck/trunk/impl/src/main/resources.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-17 18:12:13 -0400 (Fri, 17 Jul 2009)
New Revision: 3084
Modified:
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
whitespace
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-17 22:11:53 UTC (rev 3083)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-17 22:12:13 UTC (rev 3084)
@@ -2603,8 +2603,7 @@
</assertion>
<assertion id="e">
- <text>If a producer method or field which declares a passivating scope returns an unserializable object at runtime, the container must
-throw an |IllegalProductException|.</text>
+ <text>If a producer method or field which declares a passivating scope returns an unserializable object at runtime, the container must throw an |IllegalProductException|.</text>
</assertion>
<assertion id="f">
@@ -2612,8 +2611,7 @@
</assertion>
<assertion id="g">
- <text>For a custom implementation of |Bean|, the container calls |getInjectionPoints()| to determine the injection points, and
-|InjectionPoint.isTransient()| to determine whether the injected point is a transient field.</text>
+ <text>For a custom implementation of |Bean|, the container calls |getInjectionPoints()| to determine the injection points, and |InjectionPoint.isTransient()| to determine whether the injected point is a transient field.</text>
</assertion>
<assertion id="h">
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3083 - ri/trunk/impl/src/main/java/org/jboss/webbeans.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-17 18:11:53 -0400 (Fri, 17 Jul 2009)
New Revision: 3083
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
Log:
throw IllegalProduceException for producer method returning non-serializable bean for injection in passivation capable bean
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-17 22:10:55 UTC (rev 3082)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/Validator.java 2009-07-17 22:11:53 UTC (rev 3083)
@@ -9,7 +9,7 @@
* 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,
+ * 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.
@@ -17,7 +17,6 @@
package org.jboss.webbeans;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
@@ -28,8 +27,10 @@
import java.util.List;
import java.util.Set;
+import javax.enterprise.context.Dependent;
import javax.enterprise.event.Event;
import javax.enterprise.inject.AmbiguousResolutionException;
+import javax.enterprise.inject.IllegalProductException;
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.New;
import javax.enterprise.inject.UnproxyableResolutionException;
@@ -39,6 +40,7 @@
import javax.enterprise.inject.spi.InjectionPoint;
import org.jboss.webbeans.bean.AbstractClassBean;
+import org.jboss.webbeans.bean.AbstractProducerBean;
import org.jboss.webbeans.bean.DecoratorBean;
import org.jboss.webbeans.bean.DisposalMethodBean;
import org.jboss.webbeans.bean.NewEnterpriseBean;
@@ -46,7 +48,6 @@
import org.jboss.webbeans.bean.RIBean;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.bootstrap.api.Service;
-import org.jboss.webbeans.injection.FieldInjectionPoint;
import org.jboss.webbeans.introspector.WBAnnotated;
import org.jboss.webbeans.metadata.cache.MetaAnnotationStore;
import org.jboss.webbeans.resolution.ResolvableWBClass;
@@ -114,7 +115,7 @@
{
if (!Reflections.isSerializable(decorator.getBeanClass()))
{
- throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scope but has non-serializable decorator: " + decorator);
+ throw new UnserializableDependencyException("The bean " + bean + " declares a passivating scope but has non-serializable decorator: " + decorator);
}
}
}
@@ -169,6 +170,10 @@
}
if (Beans.isPassivatingScope(ij.getBean(), beanManager) && (!ij.isTransient()) && !Beans.isPassivationCapableBean(resolvedBean))
{
+ if (resolvedBean.getScopeType().equals(Dependent.class) && resolvedBean instanceof AbstractProducerBean)
+ {
+ throw new IllegalProductException("The bean " + ij.getBean() + " declares a passivating scope but the producer returned a non-serializable bean for injection: " + resolvedBean);
+ }
throw new UnserializableDependencyException("The bean " + ij.getBean() + " declares a passivating scope but has non-serializable dependency: " + resolvedBean);
}
}
@@ -224,7 +229,7 @@
}
throw new UnsatisfiedResolutionException(buff.toString());
}
- }
+ }
private static boolean hasHigherPrecedence(Class<? extends Annotation> deploymentType, Class<? extends Annotation> otherDeploymentType, BeanManagerImpl manager)
{
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3082 - ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-17 18:10:55 -0400 (Fri, 17 Jul 2009)
New Revision: 3082
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
Log:
throw IllegalStateException if begin() called on long-running or end() called on transient conversation
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-07-17 21:26:24 UTC (rev 3081)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-07-17 22:10:55 UTC (rev 3082)
@@ -91,6 +91,10 @@
public void begin()
{
+ if (isLongRunning())
+ {
+ throw new IllegalStateException("Attempt to call begin() on a long-running conversation");
+ }
log.debug("Promoted conversation " + cid + " to long-running");
longRunning = true;
}
@@ -109,6 +113,10 @@
public void end()
{
+ if (!isLongRunning())
+ {
+ throw new IllegalStateException("Attempt to call end() on a transient conversation");
+ }
log.debug("Demoted conversation " + cid + " to transient");
longRunning = false;
}
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3081 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context: application/ejb and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-17 17:26:24 -0400 (Fri, 17 Jul 2009)
New Revision: 3081
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationState.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java
Log:
update to 20090625 spec assertions
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ApplicationContextTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -13,10 +13,9 @@
import com.gargoylesoftware.htmlunit.WebClient;
/**
- *
* @author David Allen
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@IntegrationTest(runLocally=true)
@@ -57,6 +56,7 @@
// Make a second request and make sure the same context is used
TextPage secondRequestResult = webClient.getPage(getContextPath() + "IntrospectApplication");
assert secondRequestResult.getContent() != null;
+ // should be same random number
assert Double.parseDouble(secondRequestResult.getContent()) == Double.parseDouble(firstRequestResult.getContent());
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/EJBApplicationContextTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -13,7 +13,7 @@
*
* @author David Allen
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
@IntegrationTest
@@ -22,7 +22,7 @@
{
@Test(groups = { "broken", "contexts", "webservice", "integration" })
@SpecAssertion(section = "6.7.3", id = "b")
- public void testApplicationScopeActiveDuringWebSericeInvocation()
+ public void testApplicationScopeActiveDuringWebServiceInvocation()
{
//TODO This test might work better with a separate client over HTTP
FeederService birdFeeder = getInstanceByType(FeederService.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/application/ejb/FMSModelIII.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -7,6 +7,7 @@
import javax.ejb.TimerService;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Instance;
import javax.enterprise.inject.spi.BeanManager;
@Stateless
@@ -19,6 +20,9 @@
@Current
private BeanManager beanManager;
+
+ @Current
+ private Instance<SimpleApplicationBean> simpleApplicationBeanInstance;
private static boolean applicationScopeActive = false;
private static double beanId = 0.0d;
@@ -52,14 +56,14 @@
applicationScopeActive = true;
if (beanId > 0.0)
{
- if (beanId == org.jboss.jsr299.tck.impl.OldSPIBridge.getInstanceByType(beanManager,SimpleApplicationBean.class).getId())
+ if (beanId == simpleApplicationBeanInstance.get().getId())
{
sameBean = true;
}
}
else
{
- beanId = org.jboss.jsr299.tck.impl.OldSPIBridge.getInstanceByType(beanManager,SimpleApplicationBean.class).getId();
+ beanId = simpleApplicationBeanInstance.get().getId();
}
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationBeginTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -8,22 +8,43 @@
import org.testng.annotations.Test;
/**
- *
* @author Nicklas Karlsson
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
public class ConversationBeginTest extends AbstractJSR299Test
{
+ @Override
+ public void beforeMethod()
+ {
+ super.beforeMethod();
+ Conversation conversation = getInstanceByType(Conversation.class);
+ if (conversation.isLongRunning())
+ {
+ conversation.end();
+ }
+ }
+
@Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "f")
public void testConversationBeginMakesConversationLongRunning()
{
Conversation conversation = getInstanceByType(Conversation.class);
+ assert conversation.isTransient();
conversation.begin();
assert conversation.isLongRunning();
}
+ @Test(groups = { "contexts" }, expectedExceptions = IllegalStateException.class)
+ @SpecAssertion(section = "6.7.5", id = "r")
+ public void testBeginAlreadyLongRunningConversationThrowsException()
+ {
+ Conversation conversation = getInstanceByType(Conversation.class);
+ assert conversation.isTransient();
+ conversation.begin();
+ conversation.begin();
+ }
+
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationContextTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -13,7 +13,6 @@
import org.testng.annotations.Test;
/**
- *
* @author Nicklas Karlsson
*
* Spec version: 20090625
@@ -43,7 +42,7 @@
assert getBeans(Conversation.class).iterator().next().getScopeType().equals(RequestScoped.class);
}
- @Test(groups = { "contexts" })
+ @Test(groups = { "contexts", "rewrite" })
@SpecAssertion(section = "6.7.5", id = "ic")
public void testBeanWithDeploymentTypeStandard()
{
@@ -65,7 +64,7 @@
assert found;
}
- @Test(groups = { "contexts", "ri-broken" })
+ @Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.5", id = "ie")
public void testBeanWithNameJavaxEnterpriseContextConversation()
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationEndTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -3,29 +3,55 @@
import javax.enterprise.context.Conversation;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
/**
- *
* @author Nicklas Karlsson
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
public class ConversationEndTest extends AbstractJSR299Test
{
+ @Override
+ public void beforeMethod()
+ {
+ super.beforeMethod();
+ Conversation conversation = getInstanceByType(Conversation.class);
+ if (conversation.isLongRunning())
+ {
+ conversation.end();
+ }
+ }
@Test(groups = { "contexts" })
- @SpecAssertion(section = "6.7.4", id = "g")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.7.4", id = "g"),
+ @SpecAssertion(section = "6.7.5", id = "k"),
+ @SpecAssertion(section = "6.7.5", id = "o")
+ })
public void testConversationEndMakesConversationTransient()
{
Conversation conversation = getInstanceByType(Conversation.class);
+ assert conversation.isTransient();
conversation.begin();
assert conversation.isLongRunning();
+ assert !conversation.isTransient();
conversation.end();
assert !conversation.isLongRunning();
+ assert conversation.isTransient();
}
+
+ @Test(groups = { "contexts" }, expectedExceptions = IllegalStateException.class)
+ @SpecAssertion(section = "6.7.5", id = "q")
+ public void testEndTransientConversationThrowsException()
+ {
+ Conversation conversation = getInstanceByType(Conversation.class);
+ assert conversation.isTransient();
+ conversation.end();
+ }
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByApplicationTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -3,22 +3,44 @@
import javax.enterprise.context.Conversation;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
/**
- *
* @author Nicklas Karlsson
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
public class ConversationIdSetByApplicationTest extends AbstractJSR299Test
{
-
+ @Override
+ public void beforeMethod()
+ {
+ super.beforeMethod();
+ Conversation conversation = getInstanceByType(Conversation.class);
+ if (conversation.isLongRunning())
+ {
+ conversation.end();
+ }
+ }
+
+ @Test(groups = { "contexts", "ri-broken" })
+ @SpecAssertion(section = "6.7.5", id = "l")
+ public void testTransientConversationHasNullId()
+ {
+ Conversation conversation = getInstanceByType(Conversation.class);
+ assert !conversation.isLongRunning();
+ assert conversation.getId() == null;
+ }
+
@Test(groups = { "contexts" })
- @SpecAssertion(section = "6.7.4", id = "ha")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.7.4", id = "ha"),
+ @SpecAssertion(section = "6.7.5", id = "j")
+ })
public void testConversationIdMayBeSetByApplication()
{
Conversation conversation = getInstanceByType(Conversation.class);
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationIdSetByContainerTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -3,27 +3,30 @@
import javax.enterprise.context.Conversation;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
import org.testng.annotations.Test;
/**
- *
* @author Nicklas Karlsson
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact
public class ConversationIdSetByContainerTest extends AbstractJSR299Test
{
@Test(groups = { "contexts" })
- @SpecAssertion(section = "6.7.4", id = "f")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.7.4", id = "hb"),
+ @SpecAssertion(section = "6.7.5", id = "j")
+ })
public void testConversationBeginMakesConversationLongRunning()
{
Conversation conversation = getInstanceByType(Conversation.class);
conversation.begin();
- assert conversation.isLongRunning();
+ assert conversation.getId() != null;
}
}
\ No newline at end of file
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/ConversationTimeoutTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -0,0 +1,41 @@
+package org.jboss.jsr299.tck.tests.context.conversation;
+
+import javax.enterprise.context.Conversation;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+/**
+ * @author Dan Allen
+ *
+ * Spec version: 20090625
+ */
+@Artifact
+public class ConversationTimeoutTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section = "6.7.5", id = "m")
+ public void testConversationHasDefaultTimeout()
+ {
+ Conversation conversation = getInstanceByType(Conversation.class);
+ System.out.println(conversation.getTimeout());
+ assert conversation.getTimeout() > 0;
+ }
+
+ @Test
+ @SpecAssertions({
+ @SpecAssertion(section = "6.7.5", id = "m"),
+ @SpecAssertion(section = "6.7.5", id = "n")
+ })
+ public void testSetConversationTimeoutOverride()
+ {
+ Conversation conversation = getInstanceByType(Conversation.class);
+ long oldValue = conversation.getTimeout();
+ conversation.setTimeout(1500);
+ assert conversation.getTimeout() == 1500;
+ conversation.setTimeout(oldValue);
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/AbstractConversationTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -1,6 +1,5 @@
package org.jboss.jsr299.tck.tests.context.conversation.client;
-import java.io.ObjectInputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.HashSet;
@@ -16,33 +15,15 @@
public abstract class AbstractConversationTest extends AbstractJSR299Test
{
+ // TODO this should be part of the JSR-299 API
+ 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 TIMEOUT = 200;
- protected String getCid(HttpClient client) throws Exception
- {
- HttpMethod method = new GetMethod(getConversationStatusPath("cid"));
- ObjectInputStream ois = null;
- try
- {
- client.executeMethod(method);
- ois = new ObjectInputStream(method.getResponseBodyAsStream());
- return (String) ois.readObject();
- }
- finally
- {
- if (ois != null)
- {
- ois.close();
- }
- method.releaseConnection();
- }
- }
-
-
-
protected boolean isCloudDestroyed(HttpClient client) throws Exception
{
HttpMethod method = new GetMethod(getConversationStatusPath("cloudDestroyed"));
@@ -100,14 +81,14 @@
return new URL(getConversationStatusPath(method));
}
- protected String request(HttpClient client, String viewId) throws Exception
+ protected ConversationState request(HttpClient client, String viewId) throws Exception
{
HttpMethod method = new GetMethod(getPath(viewId));
try
{
client.executeMethod(method);
assert method.getStatusCode() == 200;
- return method.getResponseHeader(CID_HEADER_NAME).getValue();
+ return new ConversationState(method.getResponseHeader(CID_HEADER_NAME).getValue(), Boolean.valueOf(method.getResponseHeader(LONG_RUNNING_HEADER_NAME).getValue()));
}
finally
{
@@ -115,6 +96,11 @@
}
}
+ protected ConversationState request(HttpClient client, String viewId, ConversationState c) throws Exception
+ {
+ return request(client, viewId + "?" + CID_REQUEST_PARAMETER_NAME + "=" + c.getId());
+ }
+
protected String getBodyAsString(HttpClient client, String viewId) throws Exception
{
HttpMethod method = new GetMethod(getPath(viewId));
@@ -145,6 +131,11 @@
}
}
+ protected boolean hasRained(HttpClient client, String viewId, ConversationState c) throws Exception
+ {
+ return hasRained(client, viewId + "?" + CID_REQUEST_PARAMETER_NAME + "=" + c.getId());
+ }
+
protected String getPath(String viewId)
{
return getContextPath() + viewId;
@@ -165,16 +156,16 @@
}
}
- protected <T> Set<T> getElements(HtmlElement rootElement, Class<T> elementClass)
+ protected <T> Set<T> getElements(HtmlElement rootElement, Class<T> elementClass)
{
Set<T> result = new HashSet<T>();
- for (HtmlElement element : rootElement.getAllHtmlChildElements())
+ for (HtmlElement element : rootElement.getAllHtmlChildElements())
{
result.addAll(getElements(element, elementClass));
}
- if (elementClass.isInstance(rootElement))
+ if (elementClass.isInstance(rootElement))
{
result.add(elementClass.cast(rootElement));
}
@@ -182,11 +173,11 @@
}
- protected <T extends HtmlElement> T getFirstMatchingElement(HtmlPage page, Class<T> elementClass, String id)
+ protected <T extends HtmlElement> T getFirstMatchingElement(HtmlPage page, Class<T> elementClass, String id)
{
Set<T> inputs = getElements(page.getBody(), elementClass);
- for (T input : inputs)
+ for (T input : inputs)
{
if (input.getId().contains(id))
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ClientConversationContextTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -2,6 +2,7 @@
import org.apache.commons.httpclient.HttpClient;
import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.testharness.impl.packaging.Classes;
import org.jboss.testharness.impl.packaging.IntegrationTest;
@@ -11,10 +12,10 @@
import org.testng.annotations.Test;
/**
- *
* @author Nicklas Karlsson
+ * @author Dan Allen
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact(addCurrentPackage=false)
@Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class})
@@ -31,24 +32,29 @@
{
@Test(groups = { "contexts" })
- @SpecAssertion(section = "6.7.4", id = "hb")
+ @SpecAssertions({
+ @SpecAssertion(section = "6.7.4", id = "hb"),
+ @SpecAssertion(section = "6.7.4", id = "o")
+ })
public void testConversationIdSetByContainerIsUnique() throws Exception
{
HttpClient client = new HttpClient();
- request(client, "/home.jsf");
- String cid1 = getCid(client);
- request(client, "/home.jsf");
- String cid2 = getCid(client);
- assert !cid1.equals(cid2);
+ ConversationState c1 = request(client, "/home.jsf");
+ ConversationState c2 = request(client, "/home.jsf");
+ assert c1.isTransient();
+ assert c2.isTransient();
+ assert !c1.getId().equals(c2.getId());
}
@Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "j")
+ // TODO this test doesn't verify that the conversation context itself is destroyed
public void testTransientConversationInstancesDestroyedAtRequestEnd() throws Exception
{
HttpClient client = new HttpClient();
resetCloud(client);
- request(client, "/cloud.jsf");
+ ConversationState c = request(client, "/cloud.jsf");
+ assert c.isTransient();
assert isCloudDestroyed(client);
}
@@ -58,8 +64,10 @@
{
HttpClient client = new HttpClient();
resetCloud(client);
- request(client, "/clouds.jsf");
+ ConversationState c = request(client, "/clouds.jsf");
assert !isCloudDestroyed(client);
+ c = request(client, "/home.jsf", c);
+ assert c.isLongRunning();
}
@Test(groups = { "contexts" })
@@ -67,9 +75,10 @@
public void testManualCidPropagation() throws Exception
{
HttpClient client = new HttpClient();
- String cid = request(client, "/clouds.jsf");
- String cid2 = request(client, "/clouds.jsf?cid=" + cid);
- assert cid.equals(cid2);
+ ConversationState c1 = request(client, "/clouds.jsf");
+ ConversationState c2 = request(client, "/clouds.jsf", c1);
+ assert c2.isLongRunning();
+ assert c1.getId().equals(c2.getId());
}
@Test(groups = { "contexts" })
@@ -77,24 +86,37 @@
public void testConversationNotPropagated() throws Exception
{
HttpClient client = new HttpClient();
- String cid = request(client, "/clouds.jsf");
- String cid2 = request(client, "/clouds.jsf");
- assert !cid.equals(cid2);
+ ConversationState c1 = request(client, "/clouds.jsf");
+ ConversationState c2 = request(client, "/clouds.jsf");
+ assert c1.isTransient();
+ assert c2.isTransient();
+ assert !c1.getId().equals(c2.getId());
}
@Test(groups = { "contexts" })
@SpecAssertion(section = "6.7.4", id = "p")
- public void testConversationsDontCrossSessionBoundary() throws Exception
+ public void testConversationsDontCrossSessionBoundary1() throws Exception
{
HttpClient client = new HttpClient();
- String cid = request(client, "/rain.jsf");
- assert hasRained(client, "/cloud.jsf?cid=" + cid);
+ ConversationState c1 = request(client, "/rain.jsf");
+ assert hasRained(client, "/cloud.jsf", c1);
invalidateSession(client);
- assert !hasRained(client, "/cloud.jsf?cid=" + cid);
+ assert !hasRained(client, "/cloud.jsf", c1);
}
@Test(groups = { "contexts" })
- @SpecAssertion(section = "6.7.4", id = "b")
+ @SpecAssertion(section = "6.7.4", id = "p")
+ public void testConversationsDontCrossSessionBoundary2() throws Exception
+ {
+ HttpClient client1 = new HttpClient();
+ HttpClient client2 = new HttpClient();
+ ConversationState c1 = request(client1, "/rain.jsf");
+ assert hasRained(client1, "/cloud.jsf", c1);
+ assert !hasRained(client2, "/cloud.jsf", c1);
+ }
+
+ @Test(groups = { "contexts" })
+ @SpecAssertion(section = "6.7.4", id = "a")
public void testConversationActiveDuringNonFacesRequest() throws Exception
{
HttpClient client = new HttpClient();
@@ -106,7 +128,9 @@
public void testConversationPropagationToNonExistentConversationLeadsToTransientConversation() throws Exception
{
HttpClient client = new HttpClient();
- assert !request(client, "/cloud.jsf?cid=org.jboss.jsr299").equals("org.jboss.jsr299");
+ ConversationState c1 = request(client, "/cloud.jsf", new ConversationState("org.jboss.jsr299", false));
+ assert c1.isTransient();
+ assert !c1.getId().equals("org.jboss.jsr299");
}
}
\ No newline at end of file
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/Cloud.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -6,11 +6,8 @@
import javax.enterprise.context.ConversationScoped;
import javax.enterprise.inject.Named;
-@ConversationScoped
-@Named
-public class Cloud implements Serializable
+public @Named @ConversationScoped class Cloud implements Serializable
{
-
public static final String NAME = Cloud.class.getName() + ".Pete";
public static final String RAINED_HEADER_NAME = Cloud.class.getName() + ".rained";
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/CloudController.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -4,16 +4,14 @@
import javax.enterprise.inject.Current;
import javax.enterprise.inject.Named;
-@Named
-public class CloudController
+public @Named class CloudController
{
-
@Current Conversation conversation;
public String getBeginConversation()
{
conversation.begin();
- return "begun conversation";
+ return "long-running conversation begun";
}
}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationState.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationState.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationState.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -0,0 +1,33 @@
+package org.jboss.jsr299.tck.tests.context.conversation.client;
+
+/**
+ * A simple bean to hold the state of the conversation that
+ * was returned in the headers of the request.
+ */
+public class ConversationState
+{
+ private String id;
+
+ private boolean longRunning;
+
+ public ConversationState(String id, boolean longRunning)
+ {
+ this.id = id;
+ this.longRunning = longRunning;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+
+ public boolean isLongRunning()
+ {
+ return longRunning;
+ }
+
+ public boolean isTransient()
+ {
+ return !longRunning;
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationStatusServlet.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -4,15 +4,21 @@
import java.io.ObjectOutputStream;
import javax.enterprise.context.Conversation;
+import javax.enterprise.inject.Current;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl;
+import org.jboss.jsr299.tck.impl.OldSPIBridge;
public class ConversationStatusServlet extends HttpServlet
{
+ @Current
+ private BeanManager beanManager;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
@@ -20,7 +26,8 @@
String method = req.getParameter("method");
if ("cid".equals(method))
{
- serializeToResponse(org.jboss.jsr299.tck.impl.OldSPIBridge.getInstanceByType(JSR299ConfigurationImpl.get().getManagers().getManager(),Conversation.class).getId(), resp);
+ Conversation conversation = OldSPIBridge.getInstanceByType(beanManager, Conversation.class);
+ serializeToResponse(conversation.getId(), resp);
}
else if ("cloudDestroyed".equals(method))
{
@@ -47,6 +54,21 @@
}
}
+ @Override
+ public void init() throws ServletException
+ {
+ //TODO Remove init code once injection works in servlet container
+ try
+ {
+ InitialContext ic = new InitialContext();
+ beanManager = (BeanManager) ic.lookup("java:app/BeanManager");
+ }
+ catch (NamingException e)
+ {
+ throw new ServletException("Error looking up manager", e);
+ }
+ }
+
private void serializeToResponse(Object object, HttpServletResponse resp) throws IOException
{
ObjectOutputStream oos = new ObjectOutputStream(resp.getOutputStream());
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -3,6 +3,7 @@
import javax.enterprise.context.ContextNotActiveException;
import javax.enterprise.context.Conversation;
import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.inject.spi.BeanManager;
import javax.faces.event.PhaseEvent;
import javax.faces.event.PhaseId;
import javax.faces.event.PhaseListener;
@@ -47,9 +48,12 @@
}
if (event.getPhaseId().equals(PhaseId.RENDER_RESPONSE))
{
+ BeanManager beanManager = JSR299ConfigurationImpl.get().getManagers().getManager();
+ Conversation conversation = OldSPIBridge.getInstanceByType(beanManager, Conversation.class);
HttpServletResponse response = (HttpServletResponse) event.getFacesContext().getExternalContext().getResponse();
- response.addHeader(AbstractConversationTest.CID_HEADER_NAME, OldSPIBridge.getInstanceByType(JSR299ConfigurationImpl.get().getManagers().getManager(),Conversation.class).getId());
- response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(OldSPIBridge.getInstanceByType(JSR299ConfigurationImpl.get().getManagers().getManager(),Cloud.class).isRained()).toString());
+ response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId());
+ response.addHeader(AbstractConversationTest.LONG_RUNNING_HEADER_NAME, String.valueOf(conversation.isLongRunning()));
+ response.addHeader(Cloud.RAINED_HEADER_NAME, new Boolean(OldSPIBridge.getInstanceByType(beanManager, Cloud.class).isRained()).toString());
response.addHeader(ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME, new Boolean(activeBeforeApplyRequestValues).toString());
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/InvalidatingSessionDestroysConversationTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -11,10 +11,9 @@
import org.testng.annotations.Test;
/**
- *
* @author Nicklas Karlsson
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact(addCurrentPackage=false)
@Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class})
@@ -29,7 +28,8 @@
{
@Test(groups = { "contexts" })
- @SpecAssertion(section = "6.7.4", id = "q")
+ @SpecAssertion(section = "6.7.4", id = "qa")
+ // TODO this test doesn't precisely probe the boundaries of the service() method
public void testInvalidatingSessionDestroysConversation() throws Exception
{
HttpClient client = new HttpClient();
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningConversationPropagatedByFacesContextTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -15,10 +15,9 @@
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
/**
- *
* @author Nicklas Karlsson
*
- * Spec version: 20090519
+ * Spec version: 20090625
*/
@Artifact(addCurrentPackage=false)
@Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class})
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java 2009-07-17 21:25:42 UTC (rev 3080)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/LongRunningInstancesNotDestroyedTest.java 2009-07-17 21:26:24 UTC (rev 3081)
@@ -1,41 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.conversation.client;
-
-import org.apache.commons.httpclient.HttpClient;
-import org.hibernate.tck.annotations.SpecAssertion;
-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.WarArtifactDescriptor;
-import org.testng.annotations.Test;
-
-/**
- *
- * @author Nicklas Karlsson
- *
- * Spec version: 20090519
- */
-@Artifact(addCurrentPackage=false)
-(a)Classes({Storm.class, ConversationTestPhaseListener.class, ConversationStatusServlet.class, Cloud.class, CloudController.class})
-@IntegrationTest(runLocally=true)
-@Resources({
- @Resource(destination=WarArtifactDescriptor.WEB_XML_DESTINATION, source="web.xml"),
- @Resource(destination="clouds.jspx", source="clouds.jsf"),
- @Resource(destination="WEB-INF/faces-config.xml", source="faces-config.xml"),
- @Resource(destination="cloud.jspx", source="cloud.jsf")
-})
-public class LongRunningInstancesNotDestroyedTest extends AbstractConversationTest
-{
-
- @Test(groups = { "contexts" })
- @SpecAssertion(section = "6.7.4", id = "k")
- public void testLongRunningConversationInstancesNotDestroyedAtRequestEnd() throws Exception
- {
- HttpClient client = new HttpClient();
- resetCloud(client);
- request(client, "/clouds.jsf");
- assert !isCloudDestroyed(client);
- }
-
-}
\ No newline at end of file
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3080 - tck/trunk/impl/src/main/resources.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-17 17:25:42 -0400 (Fri, 17 Jul 2009)
New Revision: 3080
Modified:
tck/trunk/impl/src/main/resources/tck-audit.xml
Log:
fix emphasis
Modified: tck/trunk/impl/src/main/resources/tck-audit.xml
===================================================================
--- tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-17 19:18:45 UTC (rev 3079)
+++ tck/trunk/impl/src/main/resources/tck-audit.xml 2009-07-17 21:25:42 UTC (rev 3080)
@@ -2824,7 +2824,7 @@
</assertion>
<assertion id="hb">
- <text>All long-running conversations have a string-valued unique identifier, ~which may be set by the application when the conversation is marked long-running,~ or generated by the container</text>
+ <text>All long-running conversations have a string-valued unique identifier, _which may be_ ~set by the application when the conversation is marked long-running, or~ _generated by the container_</text>
</assertion>
<assertion id="j">
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3079 - ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-07-17 15:18:45 -0400 (Fri, 17 Jul 2009)
New Revision: 3079
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
Log:
update Conversation bean name
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-07-17 17:50:49 UTC (rev 3078)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/conversation/ConversationImpl.java 2009-07-17 19:18:45 UTC (rev 3079)
@@ -9,7 +9,7 @@
* 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,
+ * 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.
@@ -34,7 +34,7 @@
* @see javax.enterprise.context.Conversation
*/
@RequestScoped
-@Named("javax.context.conversation")
+@Named("javax.enterprise.context.conversation")
@Standard
public class ConversationImpl implements Conversation, Serializable
{
@@ -64,7 +64,7 @@
/**
* Creates a new conversation from an existing one.
- *
+ *
* @param conversation The old conversation
*/
public ConversationImpl(Conversation conversation)
14 years, 11 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3078 - in ri/tags/1.0.0.PREVIEW2-PATCH2.SP1: api and 10 other directories.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-07-17 13:50:49 -0400 (Fri, 17 Jul 2009)
New Revision: 3078
Modified:
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/api/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/core-api/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/impl/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/jboss-tck-runner/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/logging/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/osgi-bundle/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/parent/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/porting-package/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/spi/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/tests/pom.xml
ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/version-matrix/pom.xml
Log:
update poms to use version 1.0.0.PREVIEW2-PATCH2.SP1
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/api/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/api/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/api/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>jsr299-api</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<packaging>jar</packaging>
<name>JSR-299 API</name>
<url>http://www.seamframework.org/WebBeans</url>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/core-api/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/core-api/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/core-api/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-api</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<name>Web Beans Core API</name>
<dependencies>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/impl/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/impl/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/impl/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<name>Web Beans Core</name>
<dependencies>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/jboss-tck-runner/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/jboss-tck-runner/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/jboss-tck-runner/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -2,7 +2,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/logging/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/logging/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/logging/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-logging</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<name>Web Beans Logging</name>
<dependencies>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/osgi-bundle/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/osgi-bundle/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/osgi-bundle/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -21,7 +21,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/parent/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/parent/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/parent/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -3,12 +3,12 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<name>Web Beans, the reference implementation of JSR-299</name>
@@ -218,9 +218,9 @@
</licenses>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW2-P...</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/ri/tags/1.0.0.PREVIEW2-PATCH2/ri</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2-PA...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2-PATCH...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/WebBeans/ri/tags/1.0.0.PREVIEW2-PATCH2.SP...</url>
</scm>
<distributionManagement>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -3,15 +3,15 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<name>Web Beans Build Aggregator</name>
<url>http://www.seamframework.org/WebBeans</url>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW2-P...</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/branches/1.0.0.PREVIEW2-PATCH2</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2-PA...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2-PATCH...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/WebBeans/tags/1.0.0.PREVIEW2-PATCH2.SP1</url>
</scm>
<distributionManagement>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/porting-package/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/porting-package/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/porting-package/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-porting-package</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<name>Web Beans Porting Package for JSR-299 TCK</name>
<dependencies>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/spi/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/spi/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/spi/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-spi</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<name>Web Beans Service Provider Interfaces</name>
<dependencies>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/tests/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/tests/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/tests/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core-test</artifactId>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<name>Web Beans Core Tests</name>
<dependencies>
Modified: ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/version-matrix/pom.xml
===================================================================
--- ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/version-matrix/pom.xml 2009-07-17 16:46:21 UTC (rev 3077)
+++ ri/tags/1.0.0.PREVIEW2-PATCH2.SP1/version-matrix/pom.xml 2009-07-17 17:50:49 UTC (rev 3078)
@@ -3,7 +3,7 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
<packaging>pom</packaging>
- <version>1.0.0.PREVIEW2-PATCH2</version>
+ <version>1.0.0.PREVIEW2-PATCH2.SP1</version>
<name>Web Beans Version Matrix</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -48,7 +48,7 @@
<properties>
<jsr299.tck.version>1.0.0.BETA3</jsr299.tck.version>
- <webbeans.version>1.0.0.PREVIEW2-PATCH2</webbeans.version>
+ <webbeans.version>1.0.0.PREVIEW2-PATCH2.SP1</webbeans.version>
<webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version>
<webbeans.se.version>1.0.0.BETA1</webbeans.se.version>
<jboss.test.harness.version>1.0.0.BETA3</jboss.test.harness.version>
@@ -531,9 +531,9 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/branches/1.0.0.PREVIEW2-P...</developerConnection>
- <url>http://fisheye.jboss.org/browse/WebBeans/ri/branches/1.0.0.PREVIEW2-PATCH...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2-PA...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW2-PATCH...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/WebBeans/ri/tags/1.0.0.PREVIEW2-PATCH2.SP...</url>
</scm>
</project>
14 years, 11 months
- 1
- 0