[webbeans-commits] Webbeans SVN: r3430 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-11 07:03:29 -0400 (Tue, 11 Aug 2009)
New Revision: 3430
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Hallway.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HallwayBinding.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
Log:
removed unnecessary classes
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-11 10:46:46 UTC (rev 3429)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-11 11:03:29 UTC (rev 3430)
@@ -352,13 +352,10 @@
public void testDependentScopedDecoratorsAreDependentObjectsOfBean()
{
Bean<Interior> roomBean = getBeans(Interior.class, new RoomBinding()).iterator().next();
- Bean<Interior> hallwayBean = getBeans(Interior.class, new HallwayBinding()).iterator().next();
CreationalContext<Interior> roomCreationalContext = getCurrentManager().createCreationalContext(roomBean);
- CreationalContext<Interior> hallwayCreationalContext = getCurrentManager().createCreationalContext(hallwayBean);
Interior room = roomBean.create(roomCreationalContext);
- Interior hallway = hallwayBean.create(hallwayCreationalContext);
InteriorDecorator.reset();
@@ -368,6 +365,5 @@
roomBean.destroy(room, roomCreationalContext);
assert InteriorDecorator.isDestroyed();
-
}
}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Hallway.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Hallway.java 2009-08-11 10:46:46 UTC (rev 3429)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Hallway.java 2009-08-11 11:03:29 UTC (rev 3430)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.dependent;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-import javax.enterprise.inject.BindingType;
-
-@Target( { TYPE, METHOD, PARAMETER, FIELD })
-@Retention(RUNTIME)
-@Documented
-@BindingType
-@interface Hallway
-{
-
-}
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HallwayBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HallwayBinding.java 2009-08-11 10:46:46 UTC (rev 3429)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/HallwayBinding.java 2009-08-11 11:03:29 UTC (rev 3430)
@@ -1,8 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.dependent;
-
-import javax.enterprise.inject.AnnotationLiteral;
-
-class HallwayBinding extends AnnotationLiteral<Hallway> implements Hallway
-{
-
-}
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3429 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/decorators/definition/broken and 6 other directories.
by webbeans-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2009-08-11 06:46:46 -0400 (Tue, 11 Aug 2009)
New Revision: 3429
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/DecoratorCanNotDecorateAnotherDecoratorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/Foo.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecoratorDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
Log:
decorator tests
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-11 10:26:56 UTC (rev 3428)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -364,8 +364,8 @@
room.foo();
- assert InteriorDecorator.getInstances().size() > 0;
assert InteriorDecorator.getInstances().size() == 1;
+
roomBean.destroy(room, roomCreationalContext);
assert InteriorDecorator.isDestroyed();
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/DecoratorCanNotDecorateAnotherDecoratorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/DecoratorCanNotDecorateAnotherDecoratorTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/DecoratorCanNotDecorateAnotherDecoratorTest.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+(a)ExpectedDeploymentException(DeploymentError.class)
+@BeansXml("beans.xml")
+@SpecVersion("20090625")
+public class DecoratorCanNotDecorateAnotherDecoratorTest extends AbstractJSR299Test
+{
+ @Test(groups = "ri-broken")
+ @SpecAssertion(section="8", id="a")
+ public void testDecoratorCanNotDecorateAnotherDecorator()
+ {
+ assert false;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/Foo.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/Foo.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/Foo.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator;
+
+class Foo
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecorator.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecorator.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator;
+
+import javax.decorator.Decorates;
+import javax.decorator.Decorator;
+
+@Decorator
+class FooDecorator
+{
+ @Decorates Foo foo;
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecoratorDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecoratorDecorator.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/FooDecoratorDecorator.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator;
+
+import javax.decorator.Decorates;
+import javax.decorator.Decorator;
+
+@Decorator
+class FooDecoratorDecorator
+{
+ @Decorates FooDecorator otherDecorator;
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/DecoratorListedTwiceInBeansXmlTest.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,28 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+(a)ExpectedDeploymentException(DeploymentError.class)
+@BeansXml("beans.xml")
+@SpecVersion("20090625")
+public class DecoratorListedTwiceInBeansXmlTest extends AbstractJSR299Test
+{
+ @Test(groups = { "ri-broken" })
+ @SpecAssertion(section="8.2", id="bc")
+ public void testDecoratorListedTwiceInBeansXmlNotOK()
+ {
+ assert false;
+ }
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/Present.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml;
+
+class Present
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/PresentDecorator.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml;
+
+import javax.decorator.Decorates;
+import javax.decorator.Decorator;
+
+@Decorator
+class PresentDecorator
+{
+ @Decorates Present present;
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/ChristmasTree.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,6 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates;
+
+class ChristmasTree
+{
+
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/Elf.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates;
+
+import javax.decorator.Decorates;
+
+class Elf
+{
+ @Decorates ChristmasTree tree;
+}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/broken/nonDecoratorWithDecorates/NonDecoratorWithDecoratesTest.java 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.decorators.definition.broken.nonDecoratorWithDecorates;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DefinitionError;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+/**
+ *
+ * @author Shane Bryzak
+ */
+@Artifact
+(a)ExpectedDeploymentException(DefinitionError.class)
+@SpecVersion("20090625")
+public class NonDecoratorWithDecoratesTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertion(section="8.1.2", id="cg")
+ public void testNonDecoratorWithDecoratesAnnotationNotOK()
+ {
+ assert false;
+ }
+}
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorCanNotDecorateDecorator/beans.xml 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,7 @@
+<beans>
+ <decorators>
+ <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator.FooDecorator</decorator>
+ <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorCanNotDecorateDecorator.FooDecoratorDecorator</decorator>
+ </decorators>
+
+</beans>
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/definition/broken/decoratorListedTwiceInBeansXml/beans.xml 2009-08-11 10:46:46 UTC (rev 3429)
@@ -0,0 +1,7 @@
+<beans>
+ <decorators>
+ <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator>
+ <decorator>org.jboss.jsr299.tck.tests.decorators.definition.broken.decoratorListedTwiceInBeansXml.PresentDecorator</decorator>
+ </decorators>
+
+</beans>
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3428 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating: broken and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-11 06:26:56 -0400 (Tue, 11 Aug 2009)
New Revision: 3428
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/NonSerializableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/InterceptorType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/Violation.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ViolationProducer.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/InterceptorType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/Violation.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ViolationProducer.java
Log:
rename test/packages
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter (from rev 3426, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/BakedBean.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBean.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken13;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter;
import javax.enterprise.context.SessionScoped;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/BakedBinding.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BakedBinding.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken13;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static java.lang.annotation.ElementType.TYPE;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/BrokenInterceptor.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/BrokenInterceptor.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken13;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter;
import javax.enterprise.inject.Current;
import javax.interceptor.AroundInvoke;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/InterceptorType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/InterceptorType.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/InterceptorType.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken13;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/NonSerializableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/NonSerializableTest.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/NonSerializableTest.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken13;
-
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion("20090625")
-public class NonSerializableTest extends AbstractJSR299Test
-{
- @Test(groups = { "contexts", "passivation", "ri-broken" })
- @SpecAssertion(section = "6.6.4", id = "aad")
- public void testPassivationCapableBeanWithNonPassivatingInterceptorFails()
- {
- assert false;
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java (from rev 3426, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/NonSerializableTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentError.class)
+@SpecVersion("20090625")
+public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
+{
+ @Test(groups = { "contexts", "passivation", "ri-broken" })
+ @SpecAssertion(section = "6.6.4", id = "aad")
+ public void testPassivationCapableBeanWithNonPassivatingInterceptorFails()
+ {
+ assert false;
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/Violation.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/Violation.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken13;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter;
class Violation
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ViolationProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken13/ViolationProducer.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithBeanConstructorParameter/ViolationProducer.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken13;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithBeanConstructorParameter;
import javax.enterprise.inject.Produces;
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter (from rev 3427, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBean.java 2009-08-11 10:23:15 UTC (rev 3427)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBean.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter;
import javax.enterprise.context.SessionScoped;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBinding.java 2009-08-11 10:23:15 UTC (rev 3427)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BakedBinding.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static java.lang.annotation.ElementType.TYPE;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BrokenInterceptor.java 2009-08-11 10:23:15 UTC (rev 3427)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/BrokenInterceptor.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.Initializer;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/InterceptorType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/InterceptorType.java 2009-08-11 10:23:15 UTC (rev 3427)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/InterceptorType.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 10:23:15 UTC (rev 3427)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.DeploymentError;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/Violation.java 2009-08-11 10:23:15 UTC (rev 3427)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/Violation.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter;
class Violation
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ViolationProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/ViolationProducer.java 2009-08-11 10:23:15 UTC (rev 3427)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/nonPassivatingInterceptorWithInitializerMethodParameter/ViolationProducer.java 2009-08-11 10:26:56 UTC (rev 3428)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.nonPassivatingInterceptorWithInitializerMethodParameter;
import javax.enterprise.inject.Produces;
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3427 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating: broken and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-11 06:23:15 -0400 (Tue, 11 Aug 2009)
New Revision: 3427
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/PassivationCapableBeanWithNonPassivatingInterceptorTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/NonSerializableTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBean.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBinding.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BrokenInterceptor.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/InterceptorType.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/Violation.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/ViolationProducer.java
Log:
fix test name
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor (from rev 3426, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14)
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBean.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/BakedBean.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBean.java 2009-08-11 10:23:15 UTC (rev 3427)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken14;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
import javax.enterprise.context.SessionScoped;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBinding.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/BakedBinding.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BakedBinding.java 2009-08-11 10:23:15 UTC (rev 3427)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken14;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import static java.lang.annotation.ElementType.TYPE;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BrokenInterceptor.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/BrokenInterceptor.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/BrokenInterceptor.java 2009-08-11 10:23:15 UTC (rev 3427)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken14;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
import javax.enterprise.inject.Current;
import javax.enterprise.inject.Initializer;
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/InterceptorType.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/InterceptorType.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/InterceptorType.java 2009-08-11 10:23:15 UTC (rev 3427)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken14;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/NonSerializableTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/NonSerializableTest.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/NonSerializableTest.java 2009-08-11 10:23:15 UTC (rev 3427)
@@ -1,22 +0,0 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken14;
-
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.jsr299.tck.DeploymentError;
-import org.jboss.test.audit.annotations.SpecAssertion;
-import org.jboss.test.audit.annotations.SpecVersion;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
-import org.testng.annotations.Test;
-
-@Artifact
-(a)ExpectedDeploymentException(DeploymentError.class)
-@SpecVersion("20090625")
-public class NonSerializableTest extends AbstractJSR299Test
-{
- @Test(groups = { "contexts", "passivation", "ri-broken" })
- @SpecAssertion(section = "6.6.4", id = "aae")
- public void testPassivationCapableBeanWithNonPassivatingInterceptorFails()
- {
- assert false;
- }
-}
Copied: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/PassivationCapableBeanWithNonPassivatingInterceptorTest.java (from rev 3426, tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/NonSerializableTest.java)
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/PassivationCapableBeanWithNonPassivatingInterceptorTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/PassivationCapableBeanWithNonPassivatingInterceptorTest.java 2009-08-11 10:23:15 UTC (rev 3427)
@@ -0,0 +1,22 @@
+package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
+
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.jsr299.tck.DeploymentError;
+import org.jboss.test.audit.annotations.SpecAssertion;
+import org.jboss.test.audit.annotations.SpecVersion;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.testng.annotations.Test;
+
+@Artifact
+(a)ExpectedDeploymentException(DeploymentError.class)
+@SpecVersion("20090625")
+public class PassivationCapableBeanWithNonPassivatingInterceptorTest extends AbstractJSR299Test
+{
+ @Test(groups = { "contexts", "passivation", "ri-broken" })
+ @SpecAssertion(section = "6.6.4", id = "aae")
+ public void testPassivationCapableBeanWithNonPassivatingInterceptorFails()
+ {
+ assert false;
+ }
+}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/Violation.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/Violation.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/Violation.java 2009-08-11 10:23:15 UTC (rev 3427)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken14;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
class Violation
{
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/ViolationProducer.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken14/ViolationProducer.java 2009-08-11 00:09:18 UTC (rev 3426)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/broken/passivationCapableBeanWithNonPassivatingInterceptor/ViolationProducer.java 2009-08-11 10:23:15 UTC (rev 3427)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.context.passivating.broken14;
+package org.jboss.jsr299.tck.tests.context.passivating.broken.passivationCapableBeanWithNonPassivatingInterceptor;
import javax.enterprise.inject.Produces;
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3426 - in ri/trunk: spi/src/main/java/org/jboss/webbeans/bootstrap/api and 3 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-10 20:09:18 -0400 (Mon, 10 Aug 2009)
New Revision: 3426
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Bootstrap.java
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java
ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletLifecycle.java
Log:
WBRI-332
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-08-11 00:03:07 UTC (rev 3425)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-08-11 00:09:18 UTC (rev 3426)
@@ -156,6 +156,9 @@
// The Web Beans manager
private BeanManagerImpl manager;
+ private BeanDeployer beanDeployer;
+ private DeploymentVisitor deploymentVisitor;
+ private BeanStore requestBeanStore;
public WebBeansBootstrap()
{
@@ -163,38 +166,43 @@
getServices().add(ResourceLoader.class, new DefaultResourceLoader());
}
- public void initialize()
+ public Bootstrap startContainer()
{
- verify();
- if (!getServices().contains(TransactionServices.class))
+ synchronized (this)
{
- log.info("Transactional services not available. Transactional observers will be invoked synchronously.");
+ verify();
+ if (!getServices().contains(TransactionServices.class))
+ {
+ log.info("Transactional services not available. Transactional observers will be invoked synchronously.");
+ }
+ if (!getServices().contains(EjbServices.class))
+ {
+ log.info("EJB services not available. Session beans will be simple beans, CDI-style injection into non-contextual EJBs, injection of remote EJBs and injection of @EJB in simple beans will not be available");
+ }
+ if (!getServices().contains(JmsServices.class))
+ {
+ log.info("JMS services not available. JMS resources will not be available.");
+ }
+ if (!getServices().contains(JpaServices.class))
+ {
+ log.info("JPA services not available. Injection of @PersistenceContext will not occur. Entity beans will be discovered as simple beans.");
+ }
+ if (!getServices().contains(ResourceServices.class))
+ {
+ log.info("@Resource injection not available.");
+ }
+ if (!getServices().contains(WebServices.class))
+ {
+ log.info("WebService reference injection not available.");
+ }
+ addImplementationServices();
+ createContexts();
+ this.manager = BeanManagerImpl.newRootManager(ServiceRegistries.unmodifiableServiceRegistry(getServices()));
+ CurrentManager.setRootManager(manager);
+ initializeContexts();
+ this.deploymentVisitor = new DeploymentVisitor(getServices().get(Deployment.class));
+ return this;
}
- if (!getServices().contains(EjbServices.class))
- {
- log.info("EJB services not available. Session beans will be simple beans, CDI-style injection into non-contextual EJBs, injection of remote EJBs and injection of @EJB in simple beans will not be available");
- }
- if (!getServices().contains(JmsServices.class))
- {
- log.info("JMS services not available. JMS resources will not be available.");
- }
- if (!getServices().contains(JpaServices.class))
- {
- log.info("JPA services not available. Injection of @PersistenceContext will not occur. Entity beans will be discovered as simple beans.");
- }
- if (!getServices().contains(ResourceServices.class))
- {
- log.info("@Resource injection not available.");
- }
- if (!getServices().contains(WebServices.class))
- {
- log.info("WebService reference injection not available.");
- }
- addImplementationServices();
- createContexts();
- this.manager = BeanManagerImpl.newRootManager(ServiceRegistries.unmodifiableServiceRegistry(getServices()));
- CurrentManager.setRootManager(manager);
- initializeContexts();
}
private void addImplementationServices()
@@ -217,32 +225,8 @@
{
return manager;
}
-
- /**
- * Register the bean with the getManager(), including any standard (built in)
- * beans
- *
- * @param classes The classes to register as Web Beans
- */
- protected void registerBeans(Iterable<Class<?>> classes, BeanDeployer beanDeployer)
- {
- beanDeployer.addClasses(classes);
- beanDeployer.getEnvironment().addBean(ManagerBean.of(manager));
- beanDeployer.getEnvironment().addBean(InjectionPointBean.of(manager));
- beanDeployer.getEnvironment().addBean(EventBean.of(manager));
- beanDeployer.getEnvironment().addBean(InstanceBean.of(manager));
- if (!getEnvironment().equals(Environments.SE))
- {
- beanDeployer.addClass(ConversationImpl.class);
- beanDeployer.addClass(ServletConversationManager.class);
- beanDeployer.addClass(JavaSEConversationTerminator.class);
- beanDeployer.addClass(NumericConversationIdGenerator.class);
- beanDeployer.addClass(HttpSessionManager.class);
- }
- beanDeployer.createBeans().deploy();
- }
- public void boot()
+ public Bootstrap startInitialization()
{
synchronized (this)
{
@@ -255,10 +239,10 @@
throw new IllegalStateException("No application context BeanStore set");
}
- DeploymentVisitor deploymentVisitor = new DeploymentVisitor(getServices().get(Deployment.class)).visit();
+ deploymentVisitor.visit();
beginApplication(getApplicationContext());
- BeanStore requestBeanStore = new ConcurrentHashMapBeanStore();
+ requestBeanStore = new ConcurrentHashMapBeanStore();
beginDeploy(requestBeanStore);
EjbDescriptorCache ejbDescriptors = new EjbDescriptorCache();
@@ -277,16 +261,54 @@
// Parse beans.xml before main bean deployment
parseBeansXml(deploymentVisitor.getBeansXmlUrls());
- BeanDeployer beanDeployer = new BeanDeployer(manager, ejbDescriptors);
+ beanDeployer = new BeanDeployer(manager, ejbDescriptors);
fireBeforeBeanDiscoveryEvent(beanDeployer);
- registerBeans(deploymentVisitor.getBeanClasses(), beanDeployer);
+ }
+ return this;
+ }
+
+ public Bootstrap deployBeans()
+ {
+ synchronized (this)
+ {
+ beanDeployer.addClasses(deploymentVisitor.getBeanClasses());
+ beanDeployer.getEnvironment().addBean(ManagerBean.of(manager));
+ beanDeployer.getEnvironment().addBean(InjectionPointBean.of(manager));
+ beanDeployer.getEnvironment().addBean(EventBean.of(manager));
+ beanDeployer.getEnvironment().addBean(InstanceBean.of(manager));
+ if (!getEnvironment().equals(Environments.SE))
+ {
+ beanDeployer.addClass(ConversationImpl.class);
+ beanDeployer.addClass(ServletConversationManager.class);
+ beanDeployer.addClass(JavaSEConversationTerminator.class);
+ beanDeployer.addClass(NumericConversationIdGenerator.class);
+ beanDeployer.addClass(HttpSessionManager.class);
+ }
+ beanDeployer.createBeans().deploy();
fireAfterBeanDiscoveryEvent();
log.debug("Web Beans initialized. Validating beans.");
+ }
+ return this;
+ }
+
+ public Bootstrap validateBeans()
+ {
+ synchronized (this)
+ {
getServices().get(Validator.class).validateDeployment(manager, beanDeployer.getEnvironment());
fireAfterDeploymentValidationEvent();
+ }
+ return this;
+ }
+
+ public Bootstrap endInitialization()
+ {
+ synchronized (this)
+ {
endDeploy(requestBeanStore);
}
+ return this;
}
private void parseBeansXml(Iterable<URL> urls)
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Bootstrap.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Bootstrap.java 2009-08-11 00:03:07 UTC (rev 3425)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Bootstrap.java 2009-08-11 00:09:18 UTC (rev 3426)
@@ -16,18 +16,37 @@
*/
package org.jboss.webbeans.bootstrap.api;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.BeforeShutdown;
+import javax.enterprise.inject.spi.Extension;
+
+import org.jboss.webbeans.bootstrap.spi.Deployment;
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.manager.api.WebBeansManager;
/**
- * Bootstrap API for Web Beans.
+ * Application container initialization API for Web Beans.
*
+ * To initialize the container you must call, in this order:
+ *
+ * <ol>
+ * <li>{@link #startContainer()}</li>
+ * <li>{@link #startInitialization()}</li>
+ * <li>{@link #deployBeans()}</li>
+ * <li>{@link #validateBeans()}</li>
+ * <li>{@link #endInitialization()}</li>
+ * </ol>
+ *
+ * To stop the container and clean up, you must call {@link #shutdown()}
+ *
* @author Pete Muir
*
*/
public interface Bootstrap
{
-
+
/**
* Set the bean store to use as backing for the application context
*
@@ -41,49 +60,87 @@
* @param environment the environment to use
*/
public void setEnvironment(Environment environment);
-
+
/**
- * Initialize the bootstrap:
+ * Creates the application container:
* <ul>
- * <li>Create the manager and bind it to JNDI</li>
+ * <li>Checks that the services required by the environment have been
+ * provided</li>
+ * <li>Adds container provided services</li>
+ * <li>Creates and initializes the built in contexts</li>
+ * <li>Creates the manager</li>
* </ul>
*
- * @throws IllegalStateException
- * if not all the services required for the given environment are
- * available
+ * This method name is a workaround for weird JBoss MC behavior, calling
+ *
+ *
+ * @throws IllegalStateException if not all the services required for the
+ * given environment are available
*/
- public void initialize();
-
+ public Bootstrap startContainer();
+
/**
- * Get the manager used for this application.
+ * Starts the application container initialization process:
*
- * @return the manager. Unless {@link #initialize()} has been called, this
- * method will return null.
+ * <ul>
+ * <li>Reads metadata from beans.xml and the {@link Deployment} service</li>
+ * <li>Starts the application context</li>
+ * <li>Starts the request context which lasts until
+ * {@link #endInitialization()} is called</li>
+ * <li>Discovers and creates {@link Extension} service providers</li>
+ * </ul>
+ *
+ * Finally, the {@link BeforeBeanDiscovery} event is fired.
+ *
*/
- public WebBeansManager getManager();
-
+ public Bootstrap startInitialization();
+
/**
- * Starts the boot process.
+ * Creates and deploys the application's beans:
*
- * Discovers the beans and registers them with the getManager(). Also
- * resolves the injection points. Before running {@link #boot()}
- * {@link #initialize()} must have been called and the contexts should be
- * available
+ * <ul>
+ * <li>Creates and deploys the discovered beans</li>
+ * <li>Creates and deploys the built-in beans defined by the CDI
+ * specification</li>
+ * </ul>
*
+ * Finally the {@link AfterBeanDiscovery} is event is fired
*/
- public void boot();
-
+ public Bootstrap deployBeans();
+
/**
+ * Validates the deployment.
+ *
+ * After validation, the {@link AfterDeploymentValidation} event is fired
+ */
+ public Bootstrap validateBeans();
+
+ /**
+ * Cleans up after the initialization
+ *
+ */
+ public Bootstrap endInitialization();
+
+ /**
* Causes the container to clean up and shutdown
*
+ * Before the contain is shutdown the {@link BeforeShutdown} event is fired
*/
public void shutdown();
-
+
/**
* Get the services available to this bootstrap
*
* @return the services available
*/
public ServiceRegistry getServices();
-
+
+ /**
+ * Get the manager used for this application.
+ *
+ * @return the manager. Unless {@link #startContainer()} has been called, this method
+ * will return null.
+ */
+ public WebBeansManager getManager();
+
}
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java 2009-08-11 00:03:07 UTC (rev 3425)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java 2009-08-11 00:09:18 UTC (rev 3426)
@@ -17,6 +17,8 @@
package org.jboss.webbeans.bootstrap.api.helpers;
import org.jboss.webbeans.bootstrap.api.Bootstrap;
+import org.jboss.webbeans.bootstrap.api.Environment;
+import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
import org.jboss.webbeans.context.api.BeanStore;
import org.jboss.webbeans.manager.api.WebBeansManager;
@@ -30,21 +32,12 @@
protected abstract Bootstrap delegate();
- public void boot()
- {
- delegate().boot();
- }
-
public WebBeansManager getManager()
{
return delegate().getManager();
}
+
- public void initialize()
- {
- delegate().initialize();
- }
-
public void setApplicationContext(BeanStore beanStore)
{
delegate().setApplicationContext(beanStore);
@@ -72,5 +65,35 @@
{
return delegate().equals(obj);
}
+
+ public Bootstrap deployBeans()
+ {
+ return delegate().deployBeans();
+ }
+
+ public Bootstrap endInitialization()
+ {
+ return delegate().endInitialization();
+ }
+
+ public ServiceRegistry getServices()
+ {
+ return delegate().getServices();
+ }
+
+ public void setEnvironment(Environment environment)
+ {
+ delegate().setEnvironment(environment);
+ }
+
+ public Bootstrap startInitialization()
+ {
+ return delegate().startInitialization();
+ }
+
+ public Bootstrap validateBeans()
+ {
+ return delegate().validateBeans();
+ }
}
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-08-11 00:03:07 UTC (rev 3425)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/BootstrapTest.java 2009-08-11 00:09:18 UTC (rev 3426)
@@ -23,7 +23,7 @@
bootstrap.setEnvironment(Environments.SE);
bootstrap.getServices().add(ResourceLoader.class, new MockResourceLoader());
bootstrap.setApplicationContext(new ConcurrentHashMapBeanStore());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test(expectedExceptions=IllegalStateException.class)
@@ -39,7 +39,7 @@
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(WebServices.class, new MockWebServices());
bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test(expectedExceptions=IllegalStateException.class)
@@ -55,7 +55,7 @@
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(WebServices.class, new MockWebServices());
bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test(expectedExceptions=IllegalStateException.class)
@@ -71,7 +71,7 @@
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test(expectedExceptions=IllegalStateException.class)
@@ -87,7 +87,7 @@
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(WebServices.class, new MockWebServices());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@@ -105,7 +105,7 @@
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
bootstrap.getServices().add(WebServices.class, new MockWebServices());
bootstrap.getServices().add(JmsServices.class, new MockJmsServices());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test
@@ -120,7 +120,7 @@
bootstrap.getServices().add(EjbServices.class, new MockEjbServices());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test(expectedExceptions=IllegalStateException.class)
@@ -134,7 +134,7 @@
bootstrap.getServices().add(Deployment.class, new MockDeployment());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(ResourceServices.class, new MockResourceServices());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test(expectedExceptions=IllegalStateException.class)
@@ -148,7 +148,7 @@
bootstrap.getServices().add(Deployment.class, new MockDeployment());
bootstrap.getServices().add(JpaServices.class, new MockJpaServices());
bootstrap.getServices().add(TransactionServices.class, new MockTransactionServices());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test
@@ -159,7 +159,7 @@
bootstrap.setApplicationContext(new ConcurrentHashMapBeanStore());
bootstrap.getServices().add(ResourceLoader.class, new MockResourceLoader());
bootstrap.getServices().add(Deployment.class, new MockDeployment());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
@Test
@@ -170,7 +170,7 @@
bootstrap.getServices().add(ResourceLoader.class, new MockResourceLoader());
bootstrap.setApplicationContext(new ConcurrentHashMapBeanStore());
bootstrap.getServices().add(Deployment.class, new MockDeployment());
- bootstrap.initialize();
+ bootstrap.startContainer();
}
}
Modified: ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java
===================================================================
--- ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java 2009-08-11 00:03:07 UTC (rev 3425)
+++ ri/trunk/spi/src/test/java/org/jboss/webbeans/bootstrap/api/test/MockBootstrap.java 2009-08-11 00:09:18 UTC (rev 3426)
@@ -1,28 +1,47 @@
package org.jboss.webbeans.bootstrap.api.test;
+import org.jboss.webbeans.bootstrap.api.Bootstrap;
import org.jboss.webbeans.bootstrap.api.helpers.AbstractBootstrap;
import org.jboss.webbeans.manager.api.WebBeansManager;
public class MockBootstrap extends AbstractBootstrap
{
- public void boot()
- {
-
- }
-
public WebBeansManager getManager()
{
return null;
}
- public void initialize()
+ public Bootstrap startContainer()
{
verify();
+ return this;
}
+
+
public void shutdown()
{
}
+
+ public Bootstrap deployBeans()
+ {
+ return this;
+ }
+
+ public Bootstrap endInitialization()
+ {
+ return this;
+ }
+
+ public Bootstrap startInitialization()
+ {
+ return this;
+ }
+
+ public Bootstrap validateBeans()
+ {
+ return this;
+ }
}
Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletLifecycle.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletLifecycle.java 2009-08-11 00:03:07 UTC (rev 3425)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletLifecycle.java 2009-08-11 00:09:18 UTC (rev 3426)
@@ -34,7 +34,7 @@
public void initialize()
{
- bootstrap.initialize();
+ bootstrap.startContainer();
}
public MockDeployment getDeployment()
@@ -49,7 +49,7 @@
public void beginApplication()
{
- bootstrap.boot();
+ bootstrap.startInitialization().deployBeans().validateBeans().endInitialization();
}
public void endApplication()
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3424 - ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-10 16:10:23 -0400 (Mon, 10 Aug 2009)
New Revision: 3424
Modified:
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/AbstractBootstrap.java
Log:
Clean up SPI deprecated methods
Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/AbstractBootstrap.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/AbstractBootstrap.java 2009-08-10 19:16:52 UTC (rev 3423)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/AbstractBootstrap.java 2009-08-10 20:10:23 UTC (rev 3424)
@@ -47,55 +47,7 @@
{
this.simpleServiceRegistry = new SimpleServiceRegistry();
}
-
- @Deprecated
- public void setEjbServices(EjbServices ejbServices)
- {
- getServices().add(EjbServices.class, ejbServices);
- }
-
- @Deprecated
- public void setResourceLoader(ResourceLoader resourceLoader)
- {
- getServices().add(ResourceLoader.class, resourceLoader);
- }
-
- @Deprecated
- public void setWebBeanDiscovery(WebBeanDiscovery webBeanDiscovery)
- {
- getServices().add(WebBeanDiscovery.class, webBeanDiscovery);
- }
- @Deprecated
- public void setTransactionServices(TransactionServices transactionServices)
- {
- getServices().add(TransactionServices.class, transactionServices);
- }
-
- @Deprecated
- public WebBeanDiscovery getWebBeanDiscovery()
- {
- return getServices().get(WebBeanDiscovery.class);
- }
-
- @Deprecated
- public ResourceLoader getResourceLoader()
- {
- return getServices().get(ResourceLoader.class);
- }
-
- @Deprecated
- public EjbServices getEjbServices()
- {
- return getServices().get(EjbServices.class);
- }
-
- @Deprecated
- public TransactionServices getTransactionServices()
- {
- return getServices().get(TransactionServices.class);
- }
-
public BeanStore getApplicationContext()
{
return applicationContext;
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3423 - ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-10 15:16:52 -0400 (Mon, 10 Aug 2009)
New Revision: 3423
Removed:
ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/BootstrapBean.java
Log:
Move BootstrapBean to JBoss integration
Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/BootstrapBean.java
===================================================================
--- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/BootstrapBean.java 2009-08-10 16:19:23 UTC (rev 3422)
+++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/BootstrapBean.java 2009-08-10 19:16:52 UTC (rev 3423)
@@ -1,148 +0,0 @@
-package org.jboss.webbeans.bootstrap.api.helpers;
-
-import org.jboss.webbeans.bootstrap.api.Bootstrap;
-import org.jboss.webbeans.bootstrap.api.Environment;
-import org.jboss.webbeans.bootstrap.api.ServiceRegistry;
-import org.jboss.webbeans.bootstrap.spi.Deployment;
-import org.jboss.webbeans.context.api.BeanStore;
-import org.jboss.webbeans.ejb.spi.EjbServices;
-import org.jboss.webbeans.manager.api.WebBeansManager;
-import org.jboss.webbeans.messaging.spi.JmsServices;
-import org.jboss.webbeans.persistence.spi.JpaServices;
-import org.jboss.webbeans.resources.spi.ResourceLoader;
-import org.jboss.webbeans.resources.spi.ResourceServices;
-import org.jboss.webbeans.transaction.spi.TransactionServices;
-import org.jboss.webbeans.ws.spi.WebServices;
-
-/**
- * A bean version of bootstrap that delegates to the underlying bootstrap impl
- *
- * @author Pete Muir
- *
- */
-public class BootstrapBean implements Bootstrap
-{
-
- private final Bootstrap bootstrap;
-
- public BootstrapBean(Bootstrap bootstrap)
- {
- this.bootstrap = bootstrap;
- }
-
- public void setEjbServices(EjbServices ejbServices)
- {
- bootstrap.getServices().add(EjbServices.class, ejbServices);
- }
-
- public EjbServices getEjbServices()
- {
- return bootstrap.getServices().get(EjbServices.class);
- }
-
- public void setJpaServices(JpaServices jpaServices)
- {
- bootstrap.getServices().add(JpaServices.class, jpaServices);
- }
-
- public JpaServices getJpaServices()
- {
- return bootstrap.getServices().get(JpaServices.class);
- }
-
- public ResourceServices getResourceServices()
- {
- return bootstrap.getServices().get(ResourceServices.class);
- }
-
- public void setResourceServices(ResourceServices resourceServices)
- {
- bootstrap.getServices().add(ResourceServices.class, resourceServices);
- }
-
- public void setDeployment(Deployment deployment)
- {
- bootstrap.getServices().add(Deployment.class, deployment);
- }
-
- public Deployment getDeployment()
- {
- return bootstrap.getServices().get(Deployment.class);
- }
-
- public void setTransactionServices(TransactionServices transactionServices)
- {
- bootstrap.getServices().add(TransactionServices.class, transactionServices);
- }
-
- public TransactionServices getTransactionServices()
- {
- return bootstrap.getServices().get(TransactionServices.class);
- }
-
- public void setApplicationContext(BeanStore applicationContext)
- {
- bootstrap.setApplicationContext(applicationContext);
- }
-
- public void setResourceLoader(ResourceLoader resourceLoader)
- {
- bootstrap.getServices().add(ResourceLoader.class, resourceLoader);
- }
-
- public ResourceLoader getResourceLoader()
- {
- return bootstrap.getServices().get(ResourceLoader.class);
- }
-
- public WebServices getWebServices()
- {
- return bootstrap.getServices().get(WebServices.class);
- }
-
- public void setWebServices(WebServices webServices)
- {
- bootstrap.getServices().add(WebServices.class, webServices);
- }
-
- public JmsServices getJmsServices()
- {
- return bootstrap.getServices().get(JmsServices.class);
- }
-
- public void setJmsServices(JmsServices jmsServices)
- {
- bootstrap.getServices().add(JmsServices.class, jmsServices);
- }
-
- public void boot()
- {
- bootstrap.boot();
- }
-
- public WebBeansManager getManager()
- {
- return bootstrap.getManager();
- }
-
- public ServiceRegistry getServices()
- {
- return bootstrap.getServices();
- }
-
- public void initialize()
- {
- bootstrap.initialize();
- }
-
- public void setEnvironment(Environment environment)
- {
- bootstrap.setEnvironment(environment);
- }
-
- public void shutdown()
- {
- bootstrap.shutdown();
- }
-
-}
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3422 - ri/trunk/impl/src/main/java/org/jboss/webbeans/jsp.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-10 12:19:23 -0400 (Mon, 10 Aug 2009)
New Revision: 3422
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/jsp/JspInitialization.java
Log:
WBRI-339
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/jsp/JspInitialization.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/jsp/JspInitialization.java 2009-08-10 14:51:28 UTC (rev 3421)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/jsp/JspInitialization.java 2009-08-10 16:19:23 UTC (rev 3422)
@@ -32,7 +32,7 @@
public void init(ServletContext context)
{
// JSP 2.1 specific check
- if (JspFactory.getDefaultFactory().getJspApplicationContext(context) == null)
+ if (JspFactory.getDefaultFactory() == null || JspFactory.getDefaultFactory().getJspApplicationContext(context) == null)
{
return;
}
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3421 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/context/dependent and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-10 10:51:28 -0400 (Mon, 10 Aug 2009)
New Revision: 3421
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml
Log:
ALter test to not depend on ambiguous behavior in the spec
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-10 14:33:00 UTC (rev 3420)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-08-10 14:51:28 UTC (rev 3421)
@@ -347,7 +347,7 @@
assert HorseStable.isDestroyed();
}
- @Test(groups = { "contexts", "broken" })
+ @Test(groups = { "contexts" })
@SpecAssertion(section = "6.4.1", id = "ab")
public void testDependentScopedDecoratorsAreDependentObjectsOfBean()
{
@@ -360,16 +360,14 @@
Interior room = roomBean.create(roomCreationalContext);
Interior hallway = hallwayBean.create(hallwayCreationalContext);
- InteriorDecorator.instances.clear();
+ InteriorDecorator.reset();
room.foo();
- assert InteriorDecorator.instances.size() > 0;
- assert InteriorDecorator.instances.size() == 1;
+ assert InteriorDecorator.getInstances().size() > 0;
+ assert InteriorDecorator.getInstances().size() == 1;
+ roomBean.destroy(room, roomCreationalContext);
+ assert InteriorDecorator.isDestroyed();
- hallway.foo();
-
- assert InteriorDecorator.instances.size() == 2;
- assert !InteriorDecorator.instances.get(0).equals(InteriorDecorator.instances.get(1));
}
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java 2009-08-10 14:33:00 UTC (rev 3420)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/InteriorDecorator.java 2009-08-10 14:51:28 UTC (rev 3421)
@@ -3,20 +3,51 @@
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.PreDestroy;
import javax.decorator.Decorates;
import javax.decorator.Decorator;
@Decorator
class InteriorDecorator
{
- @Decorates Interior interior;
+ @Decorates @Room Interior interior;
- public static List<InteriorDecorator> instances = new ArrayList<InteriorDecorator>();
+ private static List<InteriorDecorator> instances = new ArrayList<InteriorDecorator>();
+ private static boolean destroyed;
+
+ public static void reset()
+ {
+ instances.clear();
+ destroyed = false;
+ }
+
public void foo()
{
instances.add(this);
interior.foo();
}
+
+ @PreDestroy
+ public void preDestroy()
+ {
+ destroyed = true;
+ }
+
+ /**
+ * @return the instances
+ */
+ public static List<InteriorDecorator> getInstances()
+ {
+ return instances;
+ }
+
+ /**
+ * @return the destroyed
+ */
+ public static boolean isDestroyed()
+ {
+ return destroyed;
+ }
}
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml 2009-08-10 14:33:00 UTC (rev 3420)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/context/dependent/beans.xml 2009-08-10 14:51:28 UTC (rev 3421)
@@ -1,3 +1,6 @@
<beans>
+ <decorators>
+ <decorator>org.jboss.jsr299.tck.tests.context.dependent.InteriorDecorator</decorator>
+ </decorators>
</beans>
15 years, 5 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3420 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-08-10 10:33:00 -0400 (Mon, 10 Aug 2009)
New Revision: 3420
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java
Log:
ws
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-08-10 14:21:33 UTC (rev 3419)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/FooDecorator.java 2009-08-10 14:33:00 UTC (rev 3420)
@@ -32,6 +32,6 @@
*
*/
private static final long serialVersionUID = -2253839366401409666L;
-@Decorates FooBar foobar;
+ @Decorates FooBar foobar;
}
15 years, 5 months
- 1
- 0