February 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r1674 - in tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit: context/passivating and 10 other directories.

by webbeans-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-02-24 03:35:39 -0500 (Tue, 24 Feb 2009) New Revision: 1674 Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/Kaarina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/Hamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/Porvoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/CityBinding.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/Kotka_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/CityInterface.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/Raisio_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Vantaa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Forssa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/City.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/NonSerializableTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Peraseinajoki.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation2.java Removed: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Forssa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hamina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kaarina_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kotka_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Peraseinajoki.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Porvoo_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Raisio_Broken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vantaa_Broken.java Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java Log: removed deployBeans() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -10,6 +10,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -24,12 +25,13 @@ * * Spec version: PRD2 */ +@Artifact public class NormalContextTest extends AbstractDeclarativeTest { Context context; - @BeforeMethod + @BeforeMethod(dependsOnMethods = "beforeMethod") public void initContext() { context = new DummyContext(); @@ -40,8 +42,6 @@ @SpecAssertion(section = "8.1", id = "a") public void testGetReturnsExistingInstance() { - deployBeans(MySessionBean.class); - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); @@ -54,8 +54,6 @@ @SpecAssertion(section = "8.1", id = "b") public void testGetWithoutCreationalContextReturnsNull() { - deployBeans(MySessionBean.class); - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null; } @@ -64,7 +62,6 @@ @SpecAssertion(section = "8.1", id = "c") public void testGetWithCreationalContextReturnsNewInstance() { - deployBeans(); MyContextual bean = new MyContextual(getCurrentManager()); bean.setShouldReturnNullInstances(false); getCurrentManager().addBean(bean); @@ -93,8 +90,6 @@ @SpecAssertion(section = "8.1", id = "e") public void testGetMayNotCreateNewInstanceUnlessCreationalContextGiven() { - deployBeans(MySessionBean.class, MyApplicationBean.class); - Contextual<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); assert getCurrentManager().getContext(SessionScoped.class).get(mySessionBean) == null; @@ -130,7 +125,6 @@ @SpecAssertion(section = "8.1", id = "g") public void testDestroyedInstanceMustNotBeReturnedByGet() { - deployBeans(MySessionBean.class, MyApplicationBean.class); Bean<MySessionBean> mySessionBean = getCurrentManager().resolveByType(MySessionBean.class).iterator().next(); MyCreationalContext<MySessionBean> myCreationalContext = new MyCreationalContext<MySessionBean>(); MySessionBean beanInstance = getCurrentManager().getContext(SessionScoped.class).get(mySessionBean, myCreationalContext); @@ -154,7 +148,6 @@ @SpecAssertion(section = "8.1", id = "h") public void testInvokingGetOnInactiveContextFails() { - deployBeans(MySessionBean.class); Context sessionContext = getCurrentManager().getContext(SessionScoped.class); assert sessionContext.isActive(); setContextInactive(sessionContext); Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Forssa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Forssa_Broken.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Forssa_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Initializer; - -@SessionScoped -class Forssa_Broken implements Serializable -{ - private static final long serialVersionUID = 2155797154677120837L; - - public Forssa_Broken() { - } - - @Initializer - public Forssa_Broken(@Current Violation reference) { - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hamina_Broken.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Hamina_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.SessionScoped; - -@SessionScoped -class Hamina_Broken -{ - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kaarina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kaarina_Broken.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kaarina_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,20 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.SessionScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -@SessionScoped -class Kaarina_Broken -{ - @CityBinding - public void foo() - { - } - - @Remove - public void bye() - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kotka_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kotka_Broken.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Kotka_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; - -@SessionScoped -class Kotka_Broken implements Serializable -{ - private static final long serialVersionUID = -1208921426884983474L; - - @CityBinding - public void foo() { - - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Loviisa_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,21 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Initializer; - -@SessionScoped -class Loviisa_Broken extends City implements Serializable -{ - private static final long serialVersionUID = -2866858442948392508L; - - public Loviisa_Broken() { - } - - @Initializer - public Loviisa_Broken(@Current Violation reference) { - - } -} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/PassivatingContextTest.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -5,7 +5,6 @@ import javax.context.Context; import javax.context.SessionScoped; -import javax.inject.DefinitionException; import javax.inject.IllegalProductException; import javax.inject.UnserializableDependencyException; import javax.inject.manager.Bean; @@ -13,6 +12,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -22,20 +22,13 @@ * * Spec version: PRD2 */ +@Artifact public class PassivatingContextTest extends AbstractDeclarativeTest { - @Test(groups = { "contexts", "passivation" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "8.4", id = "b") - public void testSimpleWebBeanWithNonSerializableImplementationClassFails() - { - deployBeans(Hamina_Broken.class); - } - @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "8.4", id = "b") public void testSimpleWebBeanWithSerializableImplementationClassOK() { - deployBeans(Jyvaskyla.class); Set<Bean<Jyvaskyla>> beans = getCurrentManager().resolveByType(Jyvaskyla.class); assert !beans.isEmpty(); } @@ -43,14 +36,12 @@ @Test @SpecAssertion(section="8.4", id = "ca") public void testInjectionOfDependentSerializableProductIntoNormalBean() { - deployBeans(Generator.class, NumberConsumer.class); getCurrentManager().getInstanceByType(NumberConsumer.class).ping(); } @Test @SpecAssertion(section="8.4", id = "cb") public void testInjectionOfDependentPrimitiveProductIntoNormalBean() { - deployBeans(Generator.class, FooConsumer.class); getCurrentManager().getInstanceByType(FooConsumer.class).ping(); } @@ -61,7 +52,6 @@ }) public void testSimpleWebBeanDeclaringPassivatingScopeIsSerializedWhenContextIsPassivated() throws IOException, ClassNotFoundException { - deployBeans(Kajaani.class); Kajaani instance = getCurrentManager().getInstanceByType(Kajaani.class); instance.setTheNumber(100); Context sessionContext = getCurrentManager().getContext(SessionScoped.class); @@ -81,45 +71,7 @@ return resurrected.toString().equals(instance.toString()); } - @Test(groups = { "contexts", "passivation", "stub" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "8.4", id = "j") - public void testDependentInterceptorsOfStatefulEnterpriseBeanMustBeSerializable() - { - //deployBeans(Kaarina_Broken.class); - assert false; - } - /** - * On the other hand, dependent objects (including interceptors and - * decorators with scope @Dependent) of a stateful session bean or of a Web - * Bean with a passivating scope must be serialized and deserialized along - * with their owner - */ - @Test(groups = { "contexts", "passivation", "stub" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "8.4", id = "j") - public void testDependentDecoratorsOfStatefulEnterpriseBeanMustBeSerializable() - { - //deployBeans(Porvoo_Broken.class); - assert false; - } - - @Test(groups = { "contexts", "passivation", "stub" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "8.4", id = "k") - public void testDependentInterceptorsOfWebBeanWithPassivatingScopeMustBeSerializable() - { - //deployBeans(Kotka_Broken.class); - assert false; - } - - @Test(groups = { "contexts", "passivation", "stub" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "8.4", id = "k") - public void testDependentDecoratorsOfWebBeansWithPassivatingScopeMustBeSerializable() - { - //deployBeans(Raisio_Broken.class); - assert false; - } - - /** * @throws ClassNotFoundException * @throws IOException */ @@ -127,7 +79,6 @@ @SpecAssertion(section = "8.4", id = "j") public void testDependentEJBsAreSerializable() throws IOException, ClassNotFoundException { - deployBeans(Vaasa.class, Helsinki.class); Set<Bean<Vaasa>> vaasaBeans = getCurrentManager().resolveByType(Vaasa.class); assert vaasaBeans.size() == 1; assert testSerialize(vaasaBeans.iterator().next()); @@ -137,52 +88,21 @@ @SpecAssertion(section = "8.4", id = "k") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoStatefulSessionBeanFails() { - deployBeans(Violation.class, Espoo_Broken.class); getCurrentManager().getInstanceByType(Espoo_Broken.class); } - @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "8.4", id = "l") - public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() - { - deployBeans(Vantaa_Broken.class, Violation.class); - } - @Test(groups = { "contexts", "passivation" }) @SpecAssertion(section = "8.4", id = "l") public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK() { - deployBeans(Joensuu.class, Violation.class); Set<Bean<Joensuu>> beans = getCurrentManager().resolveByType(Joensuu.class); assert !beans.isEmpty(); } - @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "8.4", id = "m") - public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() - { - deployBeans(Loviisa_Broken.class, Violation.class); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "8.4", id = "n") - public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() - { - deployBeans(Forssa_Broken.class, Violation.class); - } - - @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) - @SpecAssertion(section = "8.4", id = "o") - public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails() - { - deployBeans(Peraseinajoki.class, Violation.class, Violation2.class); - } - @Test(groups = { "contexts", "passivation" }, expectedExceptions = IllegalProductException.class) @SpecAssertion(section = "8.4", id = "q") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() { - deployBeans(CityProducer2.class, Nokia_Broken.class); getCurrentManager().getInstanceByType(Nokia_Broken.class).ping(); } @@ -190,7 +110,6 @@ @SpecAssertion(section = "8.4", id = "q") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() { - deployBeans(CityProducer2.class, Hyvinkaa.class); Set<Bean<Hyvinkaa>> beans = getCurrentManager().resolveByType(Hyvinkaa.class); assert !beans.isEmpty(); } @@ -199,7 +118,6 @@ @SpecAssertion(section = "8.4", id = "r") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() { - deployBeans(CityProducer2.class, Loviisa_Broken.class); getCurrentManager().getInstanceByType(Loviisa_Broken.class).ping(); } @@ -207,7 +125,6 @@ @SpecAssertion(section = "8.4", id = "s") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() { - deployBeans(CityProducer2.class, Kuopio_Broken.class); getCurrentManager().getInstanceByType(Kuopio_Broken.class).ping(); } @@ -215,7 +132,6 @@ @SpecAssertion(section = "8.4", id = "t") public void testDependentScopedProducerMethodReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails() { - deployBeans(CityProducer2.class, Jamsa_Broken.class); getCurrentManager().getInstanceByType(Jamsa_Broken.class).ping(); } @@ -223,7 +139,6 @@ @SpecAssertion(section = "8.4", id = "q") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() { - deployBeans(CityProducer.class, Uusikaupunki_Broken.class); getCurrentManager().getInstanceByType(Uusikaupunki_Broken.class).ping(); } @@ -231,7 +146,6 @@ @SpecAssertion(section = "8.4", id = "q") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoTransientFieldOfWebBeanWithPassivatingScopeOK() { - deployBeans(CityProducer.class, Salo_Broken.class); getCurrentManager().getInstanceByType(Salo_Broken.class).ping(); } @@ -239,7 +153,6 @@ @SpecAssertion(section = "8.4", id = "r") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() { - deployBeans(CityProducer.class, Loviisa_Broken.class); getCurrentManager().getInstanceByType(Loviisa_Broken.class).ping(); } @@ -247,7 +160,6 @@ @SpecAssertion(section = "8.4", id = "s") public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() { - deployBeans(CityProducer.class, Mikkeli_Broken.class); getCurrentManager().getInstanceByType(Mikkeli_Broken.class).ping(); } @@ -256,7 +168,6 @@ public void testDependentScopedProducerFieldReturnsNonSerializableObjectForInjectionIntoProducerMethodParameterWithPassivatingScopeFails() { // TODO Not quite sure what this test is doing - deployBeans(CityProducer.class, Jamsa_Broken.class); getCurrentManager().getInstanceByType(Jamsa_Broken.class).ping(); } } Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Peraseinajoki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Peraseinajoki.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Peraseinajoki.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,16 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.SessionScoped; -import javax.inject.Current; -import javax.inject.Produces; - -class Peraseinajoki extends City -{ - - @Produces @SessionScoped - public Violation2 create(@Current Violation reference) - { - return new Violation2(); - } - -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Porvoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Porvoo_Broken.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Porvoo_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,19 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import javax.context.SessionScoped; -import javax.ejb.Remove; -import javax.ejb.Stateful; - -@Stateful -@SessionScoped -class Porvoo_Broken implements CityInterface -{ - public void foo() - { - } - - @Remove - public void bye() - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Raisio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Raisio_Broken.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Raisio_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,15 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; - -@SessionScoped -class Raisio_Broken implements CityInterface, Serializable -{ - private static final long serialVersionUID = 2726489129474229549L; - - public void foo() - { - } -} Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vantaa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vantaa_Broken.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/Vantaa_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -1,30 +0,0 @@ -package org.jboss.jsr299.tck.unit.context.passivating; - -import java.io.Serializable; - -import javax.context.SessionScoped; -import javax.inject.Current; - -@SessionScoped -class Vantaa_Broken implements Serializable -{ - private static final long serialVersionUID = -1686562136639336613L; - - @Current - private Violation reference; - - public Violation getReference() - { - return reference; - } - - public void setReference(Violation reference) - { - this.reference = reference; - } - - public String test() { - return reference.toString(); - } - -} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/CityBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/CityBinding.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken1; + +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.context.Dependent; +import javax.interceptor.InterceptorBindingType; + +@InterceptorBindingType +@Dependent +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@interface CityBinding +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/DependentInterceptorSerializable.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken1; + +import javax.inject.UnserializableDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(UnserializableDependencyException.class) +public class DependentInterceptorSerializable extends AbstractDeclarativeTest +{ + @Test(groups = { "contexts", "passivation", "stub" }) + @SpecAssertion(section = "8.4", id = "j") + public void testDependentInterceptorsOfStatefulEnterpriseBeanMustBeSerializable() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/Kaarina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/Kaarina_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken1/Kaarina_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken1; + +import javax.context.SessionScoped; +import javax.ejb.Remove; +import javax.ejb.Stateful; + +@Stateful +@SessionScoped +class Kaarina_Broken +{ + @CityBinding + public void foo() + { + } + + @Remove + public void bye() + { + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/Hamina_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/Hamina_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/Hamina_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken2; + +import javax.context.SessionScoped; + +@SessionScoped +class Hamina_Broken +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/NonSerializableTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken2/NonSerializableTest.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,28 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken2; + +import javax.inject.DefinitionException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +/** + * + * @author Nicklas Karlsson + * @author David Allen + * + * Spec version: PRD2 + */ +@Artifact +(a)ExpectedDeploymentException(DefinitionException.class) +public class NonSerializableTest extends AbstractDeclarativeTest +{ + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4", id = "b") + public void testSimpleWebBeanWithNonSerializableImplementationClassFails() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/CityInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/CityInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/CityInterface.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken3; + +interface CityInterface +{ + public void foo(); +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/DependentDecoratorSerializable.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken3; + +import javax.inject.UnserializableDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(UnserializableDependencyException.class) +public class DependentDecoratorSerializable extends AbstractDeclarativeTest +{ + @Test(groups = { "contexts", "passivation", "stub" }) + @SpecAssertion(section = "8.4", id = "j") + public void testDependentDecoratorsOfStatefulEnterpriseBeanMustBeSerializable() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/Porvoo_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/Porvoo_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken3/Porvoo_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken3; + +import javax.context.SessionScoped; +import javax.ejb.Remove; +import javax.ejb.Stateful; + +@Stateful +@SessionScoped +class Porvoo_Broken implements CityInterface +{ + public void foo() + { + } + + @Remove + public void bye() + { + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/CityBinding.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/CityBinding.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/CityBinding.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken4; + +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.context.Dependent; +import javax.interceptor.InterceptorBindingType; + +@InterceptorBindingType +@Dependent +@Target({TYPE, METHOD}) +@Retention(RUNTIME) +@interface CityBinding +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/DependentInterceptorSerializable.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken4; + +import javax.inject.UnserializableDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(UnserializableDependencyException.class) +public class DependentInterceptorSerializable extends AbstractDeclarativeTest +{ + @Test(groups = { "contexts", "passivation", "stub" }) + @SpecAssertion(section = "8.4", id = "k") + public void testDependentInterceptorsOfWebBeanWithPassivatingScopeMustBeSerializable() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/Kotka_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/Kotka_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken4/Kotka_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken4; + +import java.io.Serializable; + +import javax.context.SessionScoped; + +@SessionScoped +class Kotka_Broken implements Serializable +{ + private static final long serialVersionUID = -1208921426884983474L; + + @CityBinding + public void foo() { + + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/CityInterface.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/CityInterface.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/CityInterface.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,6 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken5; + +interface CityInterface +{ + public void foo(); +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/DependentDecoratorSerializable.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken5; + +import javax.inject.UnserializableDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(UnserializableDependencyException.class) +public class DependentDecoratorSerializable +{ + @Test(groups = { "contexts", "passivation", "stub" }) + @SpecAssertion(section = "8.4", id = "k") + public void testDependentDecoratorsOfWebBeansWithPassivatingScopeMustBeSerializable() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/Raisio_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/Raisio_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken5/Raisio_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken5; + +import java.io.Serializable; + +import javax.context.SessionScoped; + +@SessionScoped +class Raisio_Broken implements CityInterface, Serializable +{ + private static final long serialVersionUID = 2726489129474229549L; + + public void foo() + { + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/NonSerializableTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/NonSerializableTest.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken6; + +import javax.inject.UnserializableDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(UnserializableDependencyException.class) +public class NonSerializableTest extends AbstractDeclarativeTest +{ + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4", id = "l") + public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoNonTransientFieldOfWebBeanWithPassivatingScopeFails() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Vantaa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Vantaa_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Vantaa_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,30 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken6; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; + +@SessionScoped +class Vantaa_Broken implements Serializable +{ + private static final long serialVersionUID = -1686562136639336613L; + + @Current + private Violation reference; + + public Violation getReference() + { + return reference; + } + + public void setReference(Violation reference) + { + this.reference = reference; + } + + public String test() { + return reference.toString(); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Violation.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken6/Violation.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken6; + +import javax.context.Dependent; + +@Dependent +class Violation +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Loviisa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Loviisa_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Loviisa_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken7; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; + +@SessionScoped +class Loviisa_Broken extends City implements Serializable +{ + private static final long serialVersionUID = -2866858442948392508L; + + public Loviisa_Broken() { + } + + @Initializer + public Loviisa_Broken(@Current Violation reference) { + + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/NonSerializableTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/NonSerializableTest.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken7; + +import javax.inject.UnserializableDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(UnserializableDependencyException.class) +public class NonSerializableTest extends AbstractDeclarativeTest +{ + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4", id = "m") + public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoConstructorParameterOfWebBeanWithPassivatingScopeFails() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Violation.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken7/Violation.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken7; + +import javax.context.Dependent; + +@Dependent +class Violation +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Forssa_Broken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Forssa_Broken.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Forssa_Broken.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken8; + +import java.io.Serializable; + +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Initializer; + +@SessionScoped +class Forssa_Broken implements Serializable +{ + private static final long serialVersionUID = 2155797154677120837L; + + public Forssa_Broken() { + } + + @Initializer + public Forssa_Broken(@Current Violation reference) { + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/NonSerializableTest.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken8; + +import javax.inject.UnserializableDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(UnserializableDependencyException.class) +public class NonSerializableTest extends AbstractDeclarativeTest +{ + @Test(groups = { "contexts", "passivation" }, expectedExceptions = UnserializableDependencyException.class) + @SpecAssertion(section = "8.4", id = "n") + public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoInitializerParameterOfWebBeanWithPassivatingScopeFails() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Violation.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken8/Violation.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken8; + +import javax.context.Dependent; + +@Dependent +class Violation +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/City.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/City.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/City.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken9; + +class City +{ + public void ping() { + + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/NonSerializableTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/NonSerializableTest.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/NonSerializableTest.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken9; + +import javax.inject.UnserializableDependencyException; + +import org.hibernate.tck.annotations.SpecAssertion; +import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.testng.annotations.Test; + +@Artifact +(a)ExpectedDeploymentException(UnserializableDependencyException.class) +public class NonSerializableTest extends AbstractDeclarativeTest +{ + @Test(groups = { "contexts", "passivation" }) + @SpecAssertion(section = "8.4", id = "o") + public void testSimpleDependentWebBeanWithNonSerializableImplementationInjectedIntoProducerMethodParameterWithPassivatingScopeFails() + { + assert false; + } +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Peraseinajoki.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Peraseinajoki.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Peraseinajoki.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken9; + +import javax.context.SessionScoped; +import javax.inject.Current; +import javax.inject.Produces; + +class Peraseinajoki extends City +{ + + @Produces @SessionScoped + public Violation2 create(@Current Violation reference) + { + return new Violation2(); + } + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken9; + +import javax.context.Dependent; + +@Dependent +class Violation +{ + +} Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation2.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation2.java (rev 0) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/passivating/broken9/Violation2.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.unit.context.passivating.broken9; + +import javax.context.Dependent; + +@Dependent +class Violation2 +{ + +} Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-24 01:38:26 UTC (rev 1673) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldLifecycleTest.java 2009-02-24 08:35:39 UTC (rev 1674) @@ -12,6 +12,7 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; import org.testng.annotations.Test; /** @@ -19,6 +20,7 @@ * Spec version: PRD2 * */ +@Artifact public class ProducerFieldLifecycleTest extends AbstractDeclarativeTest { /* @@ -41,7 +43,6 @@ }) public void testProducerStaticFieldBean() { - deployBeans(StaticTarantulaProducer.class, TarantulaConsumer.class); new RunInDependentContext() { @@ -64,7 +65,6 @@ }) public void testProducerFieldBeanCreate() throws Exception { - deployBeans(BlackWidowProducer.class, BlackWidowConsumer.class); new RunInDependentContext() { @Override @@ -80,7 +80,6 @@ @SpecAssertion(section = "6.8", id = "i") public void testSpecializedBeanAlwaysUsed() throws Exception { - deployBeans(TarantulaProducer.class, SpecializedTarantulaProducer.class, TarantulaConsumer.class); new RunInDependentContext() { @Override @@ -100,7 +99,6 @@ }) public void testProducerFieldReturnsNullIsDependent() throws Exception { - deployBeans(NullSpiderProducer.class, NullSpiderConsumer.class); new RunInDependentContext() { @Override @@ -119,7 +117,6 @@ }) public void testProducerFieldReturnsNullIsNotDependent() throws Exception { - deployBeans(NullSpiderProducer_Broken.class, NullSpiderConsumer.class); new RunInDependentContext() { @Override

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1673 - tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng and 20 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-23 20:38:26 -0500 (Mon, 23 Feb 2009) New Revision: 1673 Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml Modified: ri/trunk/jboss-tck-runner/pom.xml tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java tck/trunk/impl/src/main/resources/tck-tests.xml Log: Fix runner, fix up some classes Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-02-24 00:59:02 UTC (rev 1672) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-24 01:38:26 UTC (rev 1673) @@ -75,11 +75,10 @@ <overWrite>true</overWrite> </artifactItem> <artifactItem> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <type>xml</type> - <classifier>suite</classifier> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-porting-package</artifactId> <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> </artifactItem> <artifactItem> <groupId>javax.el</groupId> Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/testng/ExcludeIncontainerUnderInvestigationMethodSelector.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -18,7 +18,8 @@ { if (!ConfigurationImpl.get().isStandalone() || method.getMethod().getDeclaringClass().isAnnotationPresent(IntegrationTest.class)) { - if (Arrays.asList(method.getGroups()).contains("incontainer-underInvestigation")) + List<String> groups = Arrays.asList(method.getGroups()); + if (groups.contains("incontainer-ri-broken") || groups.contains("incontainer-broken")) { methodContext.setStopped(true); return false; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/NormalContextTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -36,7 +36,7 @@ getCurrentManager().addContext(context); } - @Test(groups = { "contexts", "broken" }) + @Test(groups = { "contexts" }) @SpecAssertion(section = "8.1", id = "a") public void testGetReturnsExistingInstance() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/context/dependent/DependentContextTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -174,10 +174,11 @@ }.run(); } - @Test(groups = { "contexts", "underInvestigation" }, expectedExceptions = ContextNotActiveException.class) + @Test(groups = { "contexts", "ri-broken" }, expectedExceptions = ContextNotActiveException.class) @SpecAssertion(section = "8.3", id = "g") public void testContextIsInactive() { + // The RI test harness is broken here, it just enables the dependent context blindly //getCurrentManager().getContext(Dependent.class); } @@ -288,6 +289,7 @@ @SpecAssertion(section = "8.3.2", id = "a") public void testDestroyingParentDestroysDependents() throws Exception { + // WBRI-147 new RunInDependentContext() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/binding/BindingDefinitionTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -40,7 +40,7 @@ order.getBindings().iterator().next().annotationType().equals(Production.class); } - @Test(groups = { "annotationDefinition", "underInvestigation" }) + @Test(groups = { "annotationDefinition", "stub" }) @SpecAssertion(section = "2.3.2", id = "aa") public void testBindingHasCorrectTarget() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/deployment/broken/BrokenDeploymentTypeTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -4,23 +4,27 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.jboss.jsr299.tck.AbstractDeclarativeTest; +import org.jboss.jsr299.tck.impl.packaging.Artifact; +import org.jboss.jsr299.tck.impl.packaging.ExpectedDeploymentException; +import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; /** * * Spec version: PRD2 */ -@Test +@Artifact +@BeansXml("beans.xml") +(a)ExpectedDeploymentException(DeploymentException.class) public class BrokenDeploymentTypeTest extends AbstractDeclarativeTest { @SuppressWarnings("unchecked") - @Test(expectedExceptions=DeploymentException.class, groups="broken") + @Test @SpecAssertion(section="2.5.6", id = "c") public void testStandardMustBeDeclared() { - - //manager = configuration().getContainers().deploy(Arrays.asList(AnotherDeploymentType.class, HornedAnimalDeploymentType.class), Dog.class); + assert false; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/StereotypeDefinitionTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -76,7 +76,7 @@ assert getCurrentManager().resolveByType(Reindeer.class).iterator().next().getScopeType().equals(Dependent.class); } - @Test( groups = "broken" ) + @Test( groups = "stub" ) @SpecAssertion(section = "2.7.1.2", id = "a") public void testStereotypeWithoutInterceptors() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/definition/stereotype/multipleStereotypesWithMultipleDeploymentTypes/MultipleStereotypesWithMultipleDeploymentTypesTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -15,7 +15,7 @@ public class MultipleStereotypesWithMultipleDeploymentTypesTest extends AbstractDeclarativeTest { - @Test(groups="underInvestigation") + @Test(groups="stub") @SpecAssertions( { @SpecAssertion(section = "2.7.2", id = "e"), @SpecAssertion(section = "2.7.4", id = "c") }) public void testMultipleStereotypesWithMultipleDeploymentTypes() Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithRequestScope/SingletonWithRequestScopeTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -17,7 +17,7 @@ { - @Test(groups = { "enterpriseBeans", "incontainer-underInvestigation" }) + @Test(groups = { "enterpriseBeans", "stub" }) @SpecAssertion(section = "3.3", id = "d") public void testSingletonWithRequestScopeFails() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/enterprise/singletonWithSessionScope/SingletonWithSessionScopeTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -16,7 +16,7 @@ public class SingletonWithSessionScopeTest extends AbstractDeclarativeTest { - @Test(groups = { "enterpriseBeans", "incontainer-underInvestigation" }) + @Test(groups = { "enterpriseBeans", "stub" }) @SpecAssertion(section = "3.3", id = "d") public void testSingletonWithSessionScopeFails() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/field/ProducerFieldDefinitionTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -49,25 +49,6 @@ assert tarantulaBeans.iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } - /* - * @Test(groups="producerField", - * expectedExceptions=DefinitionException.class) - * - * @SpecAssertion(section="3.5") public void testStaticField() throws - * Exception { SimpleBean<BeanWithStaticProducerField> bean = - * createSimpleBean(BeanWithStaticProducerField.class); - * manager.addBean(bean); Field field = - * BeanWithStaticProducerField.class.getField("getString"); - * createProducerFieldBean(String.class, field, bean); } - */ - - @Test(groups = { "broken", "producerField", "enterpriseBeans" }, expectedExceptions = DefinitionException.class) - @SpecAssertion(section = "outdated", id = "outdated") - public void testProducerFieldIsNotBusinessField() throws Exception - { - deployBeans(VibratingSpiderImpl_Broken.class); - } - @Test(groups = "producerField") @SpecAssertion(section = "3.5", id = "f") public void testParameterizedReturnType() throws Exception Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/AndalusianChicken.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -6,11 +6,5 @@ @AnotherDeploymentType class AndalusianChicken extends Chicken { - private static Egg egg = new Egg(); - @Override - public Egg getEgg() - { - return egg; - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Chicken.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -4,16 +4,11 @@ class Chicken { - private static Egg egg = new Egg(); @Produces @Yummy public Egg produceEgg() { - return getEgg(); + return new Egg(this); } - public Egg getEgg() - { - return egg; - } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/Egg.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -2,5 +2,17 @@ class Egg { + + private final Chicken mother; + public Egg(Chicken mother) + { + this.mother = mother; + } + + public Chicken getMother() + { + return mother; + } + } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -191,11 +191,12 @@ assert wolfSpider.getScopeType().equals(RequestScoped.class); } - @Test(groups="underInvestigation") + @Test(groups="ri-broken") @SpecAssertion(section = "4.2", id = "d") public void testNonStaticProducerMethodNotInherited() { - assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 0; + assert getCurrentManager().resolveByType(Egg.class, new AnnotationLiteral<Yummy>() {}).size() == 1; + System.out.println(getCurrentManager().getInstanceByType(Egg.class, new AnnotationLiteral<Yummy>() {}).getMother().getClass()); + assert getCurrentManager().getInstanceByType(Egg.class, new AnnotationLiteral<Yummy>() {}).getMother().getClass().equals(Chicken.class); } - } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasDisposesParameter/ConstructorHasDisposesParameterTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -13,7 +13,7 @@ public class ConstructorHasDisposesParameterTest extends AbstractDeclarativeTest { - @Test(groups = { "disposalMethod", "underInvestigation" }) + @Test(groups = { "disposalMethod", "stub" }) @SpecAssertion(section = "3.2.6.1", id = "d") public void testConstructorHasDisposesParameter() throws Exception { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/definition/constructorHasObservesParameter/ConstructorHasObservesParameterTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -13,7 +13,7 @@ public class ConstructorHasObservesParameterTest extends AbstractDeclarativeTest { - @Test(groups = { "underInvestigation", "observerMethod" }) + @Test(groups = { "stub", "observerMethod" }) @SpecAssertion(section = "3.2.6.1", id = "e") public void testConstructorHasObservesParameter() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -100,14 +100,10 @@ assert false; } - @Test(groups = { "new", "underInvestigation" }) + @Test(groups = { "new", "stub" }) @SpecAssertion(section = "3.2.5", id = "l") public void testNewBeanHasNoDisposalMethods() { - // Class<?> type = - // TypeInfo.ofTypes(newSimpleBean.getTypes()).getSuperClass(); - // assert manager.resolveDisposalMethods(type, - // newSimpleBean.getBindings().toArray(new Annotation[0])).isEmpty(); assert false; } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/realization/RealizationTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -34,7 +34,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasSameScope() { - // deployBeans(Cow.class); assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class); } @@ -43,7 +42,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasDeploymentTypeOfRealizingClass() { - // deployBeans(Cow.class); assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @@ -52,7 +50,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasSameBindings() { - // deployBeans(Cow.class); assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class); @@ -63,17 +60,16 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasBindingsOfMethodAndRealizingType() { - // deployBeans(TameCow.class); assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1; assert getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2; assert annotationSetMatches(getCurrentManager().resolveByType(CowDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class); } - @Test(groups = "broken") + @Test(groups = "ri-broken") @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerMethodHasSameStereotypes() { - // deployBeans(LabradorKennel.class); + // WBRI-148 assert getCurrentManager().resolveByType(Dog.class).size() == 1; assert getCurrentManager().resolveByType(Dog.class).iterator().next().getScopeType().equals(RequestScoped.class); } @@ -89,7 +85,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasSameScope() { - // deployBeans(Horse.class); assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getScopeType().equals(RequestScoped.class); } @@ -98,7 +93,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasDeploymentTypeOfRealizingClass() { - // deployBeans(Horse.class); assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getDeploymentType().equals(AnotherDeploymentType.class); } @@ -107,7 +101,6 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasSameBindings() { - // deployBeans(Horse.class); assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL).iterator().next().getBindings().iterator().next().annotationType().equals(Smelly.class); @@ -118,17 +111,16 @@ @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasBindingsOfMethodAndRealizingType() { - // deployBeans(TameHorse.class); assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).size() == 1; assert getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings().size() == 2; assert annotationSetMatches(getCurrentManager().resolveByType(HorseDung.class, SMELLY_LITERAL, TAME_LITERAL).iterator().next().getBindings(), Smelly.class, Tame.class); } - @Test(groups = "broken") + @Test(groups = "ri-broken") @SpecAssertion(section = "4.4.1", id = "c") public void testRealizedBeanWithProducerFieldHasSameStereotypes() { - // deployBeans(Stable.class); + // WBRI-148 assert getCurrentManager().resolveByType(Horse.class).size() == 1; assert getCurrentManager().resolveByType(Horse.class).iterator().next().getScopeType().equals(RequestScoped.class); } @@ -158,7 +150,6 @@ @SpecAssertion(section = "4.4.1", id = "d") public void testObserverMethodInheritedAndHasSameBindings() { - // deployBeans(FarmHouse.class); assert getCurrentManager().resolveObservers(new Cow(), new AnnotationLiteral<Tame>() { }).size() == 1; Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -74,6 +74,7 @@ }) public void testSpecializedBeanNotInstantiated() throws Exception { + // TODO Needs integration env deployBeans(LazyFarmer.class, Farmer.class); new RunInDependentContext() { @@ -99,6 +100,8 @@ @SpecAssertion(section="4.3.1", id = "g") public void testProducerMethodOnSpecializedBeanCalledOnSpecializingBean() throws Exception { + + // TODO needs integration env! deployBeans(Office.class, Building.class); new RunInDependentContext() { @@ -141,14 +144,14 @@ deployBeans(Donkey_Broken.class); } - @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) + @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7", id = "a") public void testSpecializingBeanDoesNotSupportAllLocalInterfacesOnSpecializedBean() { assert false; } - @Test(groups={"broken", "specialization"},expectedExceptions=DefinitionException.class) + @Test(groups={"stub", "specialization"},expectedExceptions=DefinitionException.class) @SpecAssertion(section="3.3.7", id = "a") public void testSpecializingBeanDoesNotSupportLocalInterfaceView() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/byname/InstantiationByNameTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -15,7 +15,7 @@ public class InstantiationByNameTest extends AbstractDeclarativeTest { - @Test(groups={"underInvestigation", "resolution", "el"}) @SpecAssertion(section="5.10", id = "f") + @Test(groups={"stub", "resolution", "el"}) @SpecAssertion(section="5.10", id = "f") //TODO Need to find a way to intercept calls to the manager to verify this condition public void testGetInstanceByNameCalledOncePerDistinctNameInElExpression() { Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/unit/lookup/clientProxy/ClientProxyTest.java 2009-02-24 01:38:26 UTC (rev 1673) @@ -44,7 +44,7 @@ }.run(); } - @Test(groups="incontainer-underInvestigation") + @Test(groups="incontainer-ri-broken") @SpecAssertion(section = "5.4", id = "c") public void testSimpleWebBeanClientProxyIsSerializable() throws IOException, ClassNotFoundException { Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml (rev 0) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml 2009-02-24 01:38:26 UTC (rev 1673) @@ -0,0 +1,6 @@ +<Beans xmlns="urn:java:ee" + xmlns:test="urn:java:org.jboss.jsr299.tck.unit.definition.deployment"> + <Deploy> + <Production /> + </Deploy> +</Beans> Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/unit/definition/deployment/broken/beans.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: tck/trunk/impl/src/main/resources/tck-tests.xml =================================================================== --- tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-24 00:59:02 UTC (rev 1672) +++ tck/trunk/impl/src/main/resources/tck-tests.xml 2009-02-24 01:38:26 UTC (rev 1673) @@ -10,35 +10,12 @@ <selector-class name="org.jboss.jsr299.tck.impl.testng.ExcludeIncontainerUnderInvestigationMethodSelector" /> </method-selector> </method-selectors> - <groups > + <groups> <run> - <exclude name="stub" /> - <exclude name="broken" /> - <exclude name="underInvestigation" /> <exclude name="ri-broken" /> + <exclude name="underInvestigation" /> + <exclude name="broken" /> </run> </groups> <packages>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1672 - ri/trunk/jboss-tck-runner.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-23 19:59:02 -0500 (Mon, 23 Feb 2009) New Revision: 1672 Modified: ri/trunk/jboss-tck-runner/pom.xml Log: Add EL to the test artifacts Modified: ri/trunk/jboss-tck-runner/pom.xml =================================================================== --- ri/trunk/jboss-tck-runner/pom.xml 2009-02-24 00:45:57 UTC (rev 1671) +++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-24 00:59:02 UTC (rev 1672) @@ -75,9 +75,16 @@ <overWrite>true</overWrite> </artifactItem> <artifactItem> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-porting-package</artifactId> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <type>xml</type> + <classifier>suite</classifier> <overWrite>true</overWrite> + </artifactItem> + <artifactItem> + <groupId>javax.el</groupId> + <artifactId>el-ri</artifactId> + <overWrite>true</overWrite> <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> </artifactItem> </artifactItems>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1671 - in extensions/trunk/se: src/main/java/org/jboss/webbeans/environment/se and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-02-23 19:45:57 -0500 (Mon, 23 Feb 2009) New Revision: 1671 Modified: extensions/trunk/se/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java Log: Ignoring nbactions.xml Updating to refactored BeanMap --> BeanStore Property changes on: extensions/trunk/se ___________________________________________________________________ Name: svn:ignore + nbactions.xml target Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-02-24 00:44:38 UTC (rev 1670) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-02-24 00:45:57 UTC (rev 1671) @@ -16,7 +16,7 @@ */ package org.jboss.webbeans.environment.se; -import org.jboss.webbeans.context.beanmap.SimpleBeanMap; +import org.jboss.webbeans.context.beanstore.SimpleBeanStore; import org.jboss.webbeans.environment.se.boot.WebBeansBootstrap; import org.jboss.webbeans.lifecycle.ApplicationLifecycle; @@ -46,12 +46,12 @@ ApplicationLifecycle lifecycle = ApplicationLifecycle.instance(); lifecycle.initialize(); - final SimpleBeanMap appBeanMap = new SimpleBeanMap(); - lifecycle.beginApplication( "TODO: application id?", appBeanMap ); + final SimpleBeanStore appBeanStore = new SimpleBeanStore(); + lifecycle.beginApplication( "TODO: application id?", appBeanStore ); webBeansBootstrap.boot(); - lifecycle.endApplication( "TODO: application id?", appBeanMap ); + lifecycle.endApplication( "TODO: application id?", appBeanStore ); } Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java 2009-02-24 00:44:38 UTC (rev 1670) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java 2009-02-24 00:45:57 UTC (rev 1671) @@ -20,7 +20,7 @@ import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.context.ApplicationContext; import org.jboss.webbeans.context.DependentContext; -import org.jboss.webbeans.context.beanmap.BeanMap; +import org.jboss.webbeans.context.api.BeanStore; import org.jboss.webbeans.environment.se.events.Shutdown; import org.jboss.webbeans.log.Log; import org.jboss.webbeans.log.Logging; @@ -58,10 +58,10 @@ manager.addContext( ApplicationContext.create() ); } - public void beginApplication( String id, BeanMap applicationBeanMap ) + public void beginApplication( String id, BeanStore applicationBeanStore ) { log.trace( "Starting application " + id ); - ApplicationContext.INSTANCE.setBeanMap( applicationBeanMap ); + ApplicationContext.INSTANCE.setBeanStore( applicationBeanStore ); ApplicationContext.INSTANCE.setActive( true ); // TODO (PR): I have no idea if this is OK??? The WB spec says that the // dependant scoe is only active when the manager is doing its work. @@ -70,7 +70,7 @@ DependentContext.INSTANCE.setActive( true ); } - public void endApplication( String id, BeanMap applicationBeanMap ) + public void endApplication( String id, BeanStore applicationBeanStore ) { log.trace( "Ending application " + id ); @@ -79,7 +79,7 @@ ApplicationContext.INSTANCE.destroy(); ApplicationContext.INSTANCE.setActive( false ); - ApplicationContext.INSTANCE.setBeanMap( null ); + ApplicationContext.INSTANCE.setBeanStore( null ); } }

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1670 - examples/trunk/se/hello-world.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-02-23 19:44:38 -0500 (Mon, 23 Feb 2009) New Revision: 1670 Modified: examples/trunk/se/hello-world/ Log: ignoring nbactions.xml Property changes on: examples/trunk/se/hello-world ___________________________________________________________________ Name: svn:ignore + nbactions.xml target

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1669 - examples/trunk/se/hello-world.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-02-23 19:36:15 -0500 (Mon, 23 Feb 2009) New Revision: 1669 Removed: examples/trunk/se/hello-world/nbactions.xml Log: removing nbactions Deleted: examples/trunk/se/hello-world/nbactions.xml =================================================================== --- examples/trunk/se/hello-world/nbactions.xml 2009-02-24 00:35:33 UTC (rev 1668) +++ examples/trunk/se/hello-world/nbactions.xml 2009-02-24 00:36:15 UTC (rev 1669) @@ -1,57 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<actions> - <action> - <actionName>run</actionName> - <goals> - <goal>process-classes</goal> - <goal>org.codehaus.mojo:exec-maven-plugin:1.1:exec</goal> - </goals> - <properties> - <exec.args>-classpath %classpath org.jboss.webbeans.environment.se.StartMain Possums</exec.args> - <exec.executable>java</exec.executable> - </properties> - </action> - <action> - <actionName>debug</actionName> - <goals> - <goal>process-classes</goal> - <goal>org.codehaus.mojo:exec-maven-plugin:1.1:exec</goal> - </goals> - <properties> - <exec.args>-Xdebug -Djava.compiler=none -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath org.jboss.webbeans.environment.se.StartMain Possums</exec.args> - <jpda.listen>true</jpda.listen> - <exec.executable>java</exec.executable> - </properties> - </action> - <action> - <actionName>CUSTOM-Jalopy Format</actionName> - <displayName>Jalopy Format</displayName> - <goals> - <goal>jalopy:format</goal> - </goals> - </action> - <action> - <actionName>CUSTOM-License Format</actionName> - <displayName>License Format</displayName> - <goals> - <goal>license:format</goal> - </goals> - </action> - </actions>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1668 - extensions/trunk/se.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-02-23 19:35:33 -0500 (Mon, 23 Feb 2009) New Revision: 1668 Removed: extensions/trunk/se/nbactions.xml Log: removing nbactions Deleted: extensions/trunk/se/nbactions.xml =================================================================== --- extensions/trunk/se/nbactions.xml 2009-02-24 00:15:25 UTC (rev 1667) +++ extensions/trunk/se/nbactions.xml 2009-02-24 00:35:33 UTC (rev 1668) @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<actions> - <action> - <actionName>CUSTOM-Jalopy Format</actionName> - <displayName>Jalopy Format</displayName> - <goals> - <goal>jalopy:format</goal> - </goals> - </action> - <action> - <actionName>CUSTOM-License Format</actionName> - <displayName>License Format</displayName> - <goals> - <goal>license:format</goal> - </goals> - </action> - </actions>

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1667 - in examples/trunk: se and 20 other directories.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-02-23 19:15:25 -0500 (Mon, 23 Feb 2009) New Revision: 1667 Added: examples/trunk/se/ examples/trunk/se/hello-world/ examples/trunk/se/hello-world/nbactions.xml examples/trunk/se/hello-world/pom.xml examples/trunk/se/hello-world/src/ examples/trunk/se/hello-world/src/etc/ examples/trunk/se/hello-world/src/etc/header.txt examples/trunk/se/hello-world/src/main/ examples/trunk/se/hello-world/src/main/java/ examples/trunk/se/hello-world/src/main/java/org/ examples/trunk/se/hello-world/src/main/java/org/jboss/ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java examples/trunk/se/hello-world/src/main/resources/ examples/trunk/se/hello-world/src/main/resources/beans.xml examples/trunk/se/hello-world/src/main/resources/log4j.properties examples/trunk/se/hello-world/src/test/ examples/trunk/se/hello-world/src/test/java/ examples/trunk/se/hello-world/src/test/java/com/ examples/trunk/se/hello-world/src/test/java/com/screamingcoder/ examples/trunk/se/hello-world/src/test/java/com/screamingcoder/plebeians/ examples/trunk/se/hello-world/src/test/java/com/screamingcoder/plebeians/example/ examples/trunk/se/hello-world/src/test/java/com/screamingcoder/plebeians/example/helloworld/ examples/trunk/se/hello-world/src/test/java/com/screamingcoder/plebeians/example/helloworld/AppTest.java Log: initial checkin of webbeans se module, hello world example Added: examples/trunk/se/hello-world/nbactions.xml =================================================================== --- examples/trunk/se/hello-world/nbactions.xml (rev 0) +++ examples/trunk/se/hello-world/nbactions.xml 2009-02-24 00:15:25 UTC (rev 1667) @@ -0,0 +1,57 @@ +<?xml version="1.0" encoding="UTF-8"?> +<actions> + <action> + <actionName>run</actionName> + <goals> + <goal>process-classes</goal> + <goal>org.codehaus.mojo:exec-maven-plugin:1.1:exec</goal> + </goals> + <properties> + <exec.args>-classpath %classpath org.jboss.webbeans.environment.se.StartMain Possums</exec.args> + <exec.executable>java</exec.executable> + </properties> + </action> + <action> + <actionName>debug</actionName> + <goals> + <goal>process-classes</goal> + <goal>org.codehaus.mojo:exec-maven-plugin:1.1:exec</goal> + </goals> + <properties> + <exec.args>-Xdebug -Djava.compiler=none -Xnoagent -Xrunjdwp:transport=dt_socket,server=n,address=${jpda.address} -classpath %classpath org.jboss.webbeans.environment.se.StartMain Possums</exec.args> + <jpda.listen>true</jpda.listen> + <exec.executable>java</exec.executable> + </properties> + </action> + <action> + <actionName>CUSTOM-Jalopy Format</actionName> + <displayName>Jalopy Format</displayName> + <goals> + <goal>jalopy:format</goal> + </goals> + </action> + <action> + <actionName>CUSTOM-License Format</actionName> + <displayName>License Format</displayName> + <goals> + <goal>license:format</goal> + </goals> + </action> + </actions> Added: examples/trunk/se/hello-world/pom.xml =================================================================== --- examples/trunk/se/hello-world/pom.xml (rev 0) +++ examples/trunk/se/hello-world/pom.xml 2009-02-24 00:15:25 UTC (rev 1667) @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans</groupId> + <artifactId>hello-world-se</artifactId> + <packaging>jar</packaging> + <version>1.0-SNAPSHOT</version> + <name>Hello World SE</name> + <url>http://maven.apache.org</url> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jalopy-maven-plugin</artifactId> + <version>1.0-alpha-1</version> +  + </plugin> + <plugin> + <groupId>com.google.code.maven-license-plugin</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>1.4.0</version> + <configuration> + <basedir>${basedir}</basedir> + <header>${basedir}/src/etc/header.txt</header> + <quiet>false</quiet> + <failIfMissing>true</failIfMissing> + <aggregate>false</aggregate> + <encoding>UTF-8</encoding> + </configuration> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>format</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/maven2</url> + <releases> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <updatePolicy>always</updatePolicy> + </snapshots> + </repository> + <repository> + <id>repository.codehaus.org</id> + <name>Codehaus Repository</name> + <url>http://repository.codehaus.org</url> + </repository> + </repositories> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>se-module</artifactId> + <version>1.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + </dependencies> +</project> Added: examples/trunk/se/hello-world/src/etc/header.txt =================================================================== --- examples/trunk/se/hello-world/src/etc/header.txt (rev 0) +++ examples/trunk/se/hello-world/src/etc/header.txt 2009-02-24 00:15:25 UTC (rev 1667) @@ -0,0 +1,14 @@ +JBoss, Home of Professional Open Source +Copyright 2008, Red Hat Middleware LLC, and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. Added: examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java =================================================================== --- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java (rev 0) +++ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java 2009-02-24 00:15:25 UTC (rev 1667) @@ -0,0 +1,61 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.example.simple; + +import java.util.ArrayList; +import java.util.List; +import javax.context.ApplicationScoped; +import javax.inject.Current; +import javax.inject.Initializer; +import org.jboss.webbeans.environment.se.bindings.Parameters; + +/** + * Validates command line arguments, producing errors where applicable. + * @author Peter Royle + */ +@ApplicationScoped +public class CommandLineArgsValidator +{ + + private @Parameters List<String> validParams; + private List<String> errors = new ArrayList<String>(); + + @Initializer + public void checkParameters() + { + if (validParams.size() != 1) + { + errors.add( "Please supply just one parameter: your first name" ); + validParams.clear(); + } + } + + public boolean hasErrors() + { + return !this.errors.isEmpty(); + } + + public List<String> getErrors() + { + return errors; + } + + public List<String> getValidParameters() + { + return validParams; + } +} Added: examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java =================================================================== --- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java (rev 0) +++ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java 2009-02-24 00:15:25 UTC (rev 1667) @@ -0,0 +1,48 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.example.simple; + +import javax.event.Observes; +import javax.inject.Current; +import javax.inject.manager.Deployed; +import javax.inject.manager.Manager; + +/** + * @author Peter Royle + */ +public class HelloWorld +{ + + @Current + CommandLineArgsValidator argsVlidator; + + /** + * Prints a hello message using the first name. + * @param firstName The first name. + */ + public void printHello( @Observes + @Deployed Manager manager ) + { + if (!argsVlidator.hasErrors()) + { + System.out.println( "Hello " + argsVlidator.getValidParameters().get( 0 ) ); + } else + { + System.out.println( "Please provide just one argument: your first name" ); + } + } +} Added: examples/trunk/se/hello-world/src/main/resources/beans.xml =================================================================== --- examples/trunk/se/hello-world/src/main/resources/beans.xml (rev 0) +++ examples/trunk/se/hello-world/src/main/resources/beans.xml 2009-02-24 00:15:25 UTC (rev 1667) @@ -0,0 +1,19 @@ + +<beans></beans> Added: examples/trunk/se/hello-world/src/main/resources/log4j.properties =================================================================== --- examples/trunk/se/hello-world/src/main/resources/log4j.properties (rev 0) +++ examples/trunk/se/hello-world/src/main/resources/log4j.properties 2009-02-24 00:15:25 UTC (rev 1667) @@ -0,0 +1,25 @@ +# +# JBoss, Home of Professional Open Source +# Copyright 2008, Red Hat Middleware LLC, and individual contributors +# by the @authors tag. See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=WARN, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n Added: examples/trunk/se/hello-world/src/test/java/com/screamingcoder/plebeians/example/helloworld/AppTest.java =================================================================== --- examples/trunk/se/hello-world/src/test/java/com/screamingcoder/plebeians/example/helloworld/AppTest.java (rev 0) +++ examples/trunk/se/hello-world/src/test/java/com/screamingcoder/plebeians/example/helloworld/AppTest.java 2009-02-24 00:15:25 UTC (rev 1667) @@ -0,0 +1,54 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.screamingcoder.plebeians.example.helloworld; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite( ) + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp( ) + { + assertTrue( true ); + } +}

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1666 - in extensions/trunk: se and 23 other directories.

by webbeans-commits＠lists.jboss.org

Author: peteroyle Date: 2009-02-23 19:11:39 -0500 (Mon, 23 Feb 2009) New Revision: 1666 Added: extensions/trunk/se/ extensions/trunk/se/nbactions.xml extensions/trunk/se/pom.xml extensions/trunk/se/src/ extensions/trunk/se/src/etc/ extensions/trunk/se/src/etc/header.txt extensions/trunk/se/src/main/ extensions/trunk/se/src/main/java/ extensions/trunk/se/src/main/java/org/ extensions/trunk/se/src/main/java/org/jboss/ extensions/trunk/se/src/main/java/org/jboss/webbeans/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/ParametersBinding.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/EmptyEjbDiscovery.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/UnsupportedEjbResolver.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/UnsupportedNaming.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/WebBeansBootstrap.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bootstrap/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractClassDeploymentHandler.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractDeploymentHandler.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractScanner.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDeploymentHandler.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDeploymentMetadata.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDescriptor.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentHandler.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentMetadata.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentStrategy.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/FileDescriptor.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/Scanner.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/SimpleWebBeansDeploymentHandler.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/StandardDeploymentStrategy.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/URLScanner.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/WebBeansDeploymentProperties.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/WebBeansXmlDeploymentHandler.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryException.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryImpl.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Setup.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Start.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/exception/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/resources/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/resources/DefaultResourceLoader.java extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/EnumerationEnumeration.java extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java extensions/trunk/se/src/main/resources/ extensions/trunk/se/src/main/resources/beans.xml extensions/trunk/se/src/main/resources/log4j.properties extensions/trunk/se/src/test/ extensions/trunk/se/src/test/java/ extensions/trunk/se/src/test/java/com/ extensions/trunk/se/src/test/java/com/screamingcoder/ extensions/trunk/se/src/test/java/com/screamingcoder/plebeians/ Log: initial checkin of webbeans se module Added: extensions/trunk/se/nbactions.xml =================================================================== --- extensions/trunk/se/nbactions.xml (rev 0) +++ extensions/trunk/se/nbactions.xml 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<actions> + <action> + <actionName>CUSTOM-Jalopy Format</actionName> + <displayName>Jalopy Format</displayName> + <goals> + <goal>jalopy:format</goal> + </goals> + </action> + <action> + <actionName>CUSTOM-License Format</actionName> + <displayName>License Format</displayName> + <goals> + <goal>license:format</goal> + </goals> + </action> + </actions> Added: extensions/trunk/se/pom.xml =================================================================== --- extensions/trunk/se/pom.xml (rev 0) +++ extensions/trunk/se/pom.xml 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.webbeans</groupId> + <artifactId>se-module</artifactId> + <packaging>jar</packaging> + <version>1.0-SNAPSHOT</version> + <name>Web Beans SE Module</name> + <url>http://maven.apache.org</url> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jalopy-maven-plugin</artifactId> + <version>1.0-alpha-1</version> +  + </plugin> + <plugin> + <groupId>com.google.code.maven-license-plugin</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>1.4.0</version> + <configuration> + <basedir>${basedir}</basedir> + <header>${basedir}/src/etc/header.txt</header> + <quiet>false</quiet> + <failIfMissing>true</failIfMissing> + <aggregate>false</aggregate> + <encoding>UTF-8</encoding> + </configuration> + <executions> + <execution> + <phase>compile</phase> + <goals> + <goal>format</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Repository</name> + <url>http://repository.jboss.org/maven2</url> + <releases> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <name>JBoss Snapshots Repository</name> + <url>http://snapshots.jboss.org/maven2</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <updatePolicy>always</updatePolicy> + </snapshots> + </repository> + <repository> + <id>repository.codehaus.org</id> + <name>Codehaus Repository</name> + <url>http://repository.codehaus.org</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + + + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-ri-spi</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + +  + <dependency> + <groupId>org.jboss.webbeans</groupId> + <artifactId>webbeans-ri</artifactId> + <version>1.0.0-SNAPSHOT</version> + <exclusions> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <version>1.0.1B</version> + </dependency> + </dependencies> + +</project> Added: extensions/trunk/se/src/etc/header.txt =================================================================== --- extensions/trunk/se/src/etc/header.txt (rev 0) +++ extensions/trunk/se/src/etc/header.txt 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,14 @@ +JBoss, Home of Professional Open Source +Copyright 2008, Red Hat Middleware LLC, and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/StartMain.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,102 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se; + +import org.jboss.webbeans.context.beanmap.SimpleBeanMap; +import org.jboss.webbeans.environment.se.boot.WebBeansBootstrap; +import org.jboss.webbeans.lifecycle.ApplicationLifecycle; + +/** + * This is the main class that should always be called from the command + * line for a WebBEans SE app. Something like: + * <code> + * java -jar MyApp.jar org.jboss.webbeans.environment.se.StarMain arguments + * </code> + * @author Peter Royle + */ +public class StartMain +{ + + String[] args; + + public StartMain( String[] commandLineArgs ) + { + this.args = commandLineArgs; + } + + public void go() + { + WebBeansBootstrap webBeansBootstrap = new WebBeansBootstrap( args ); + + webBeansBootstrap.initialize(); + + ApplicationLifecycle lifecycle = ApplicationLifecycle.instance(); + lifecycle.initialize(); + final SimpleBeanMap appBeanMap = new SimpleBeanMap(); + lifecycle.beginApplication( "TODO: application id?", appBeanMap ); + + webBeansBootstrap.boot(); + + lifecycle.endApplication( "TODO: application id?", appBeanMap ); + + } + + /** + * The main method called from the command line. This little puppy + * will get the ball rolling. + * @param args the command line arguments + */ + public static void main( String[] args ) + { + new StartMain( args ).go(); + } + /** + * When an exception happens in your main app, you don't want + * the manager to come down in a screaming heap. Well, not all the time. + * Sometimes you just want to exit gently. This method will detect such + * times and behave appropriately. + * @param e + */ +// private void handleException( Throwable e ) +// { +// // check for a 'special' root cause +// boolean dealtWith = false; +// Throwable cause = e.getCause(); +// +// while (cause != null) +// { +// if (cause instanceof CleanShutdownException) +// { +// // This is a request to shut down silently, so swollow it. +// // Hoewver, if there's a message, then print it to stdout +// if (cause.getMessage() != null) +// { +// System.out.println( cause.getMessage() ); +// } +// +// dealtWith = true; +// } +// +// cause = cause.getCause(); +// } +// +// if (!dealtWith) +// { +// e.printStackTrace(); +// } +// } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/beans/ParametersFactory.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,59 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.beans; + +import org.jboss.webbeans.environment.se.bindings.Parameters; + +import java.util.ArrayList; +import java.util.Arrays; + +import javax.context.ApplicationScoped; +import javax.inject.Produces; + +/** + * The simple bean that will hold the command line arguments + * and make them available by injection (using the @Parameters binding). + * It's initialised by the StartMain class before your main app is + * initialised. + * @author Peter Royle + */ +@ApplicationScoped +public class ParametersFactory +{ + private String[] args; + + /** + * Producer method for the injectible command line args. + * @return The command line arguments. + */ + @Produces + @Parameters + public ArrayList<String> getArgs( ) + { + // TODO (PR): is there an unmodifiable, serializable List? + return new ArrayList( Arrays.asList( this.args ) ); + } + + /** + * StartMain passes in the command line args here. + * @param args The command line arguments. + */ + public void setArgs( String[] args ) + { + this.args = args; + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/Parameters.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,38 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.bindings; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.inject.BindingType; + +/** + * + * @author Peter Royle + */ +@BindingType +@Retention( RetentionPolicy.RUNTIME ) +@Target( {ElementType.PARAMETER, + ElementType.METHOD, + ElementType.FIELD +} ) +public @interface Parameters +{ +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/ParametersBinding.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/ParametersBinding.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/bindings/ParametersBinding.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,29 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.bindings; + +import javax.inject.AnnotationLiteral; + +/** + * + * @author Peter Royle + */ +public class ParametersBinding + extends AnnotationLiteral<Parameters> + implements Parameters +{ +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/EmptyEjbDiscovery.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/EmptyEjbDiscovery.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/EmptyEjbDiscovery.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,41 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.boot; + +import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; + +import java.util.Collections; + +/** + * + * @author JBoss.org, modifications by Peter Royle + */ +public class EmptyEjbDiscovery + implements EjbDiscovery +{ + + public Iterable<EjbDescriptor<?>> discoverEjbs() + { + return Collections.EMPTY_SET; + } + + protected static Iterable<Class<?>> discoverEjbs( Iterable<Class<?>> webBeanClasses ) + { + return Collections.EMPTY_SET; + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/UnsupportedEjbResolver.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/UnsupportedEjbResolver.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/UnsupportedEjbResolver.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,67 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.boot; + +import org.jboss.webbeans.ejb.spi.EjbResolver; +import org.jboss.webbeans.resources.spi.NamingContext; + +import java.lang.annotation.Annotation; + +import javax.inject.manager.InjectionPoint; + +/** + * EjbResolver which does nothing, since we are not interested in EJB + * integration. + * @author Peter Royle + */ +public class UnsupportedEjbResolver + implements EjbResolver +{ + public UnsupportedEjbResolver( ) + { + } + + public Class<?extends Annotation> getEJBAnnotation( ) + { + return null; + } + + public Class<?extends Annotation> getPersistenceContextAnnotation( ) + { + return null; + } + + public Class<?extends Annotation> getResourceAnnotation( ) + { + return null; + } + + public Object resolveEjb( InjectionPoint injectionPoint, NamingContext naming ) + { + throw new UnsupportedOperationException( "Not supported in SE environment." ); + } + + public Object resolvePersistenceContext( InjectionPoint injectionPoint, NamingContext naming ) + { + throw new UnsupportedOperationException( "Not supported in SE environment." ); + } + + public Object resolveResource( InjectionPoint injectionPoint, NamingContext naming ) + { + throw new UnsupportedOperationException( "Not supported yet in SE environment." ); + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/UnsupportedNaming.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/UnsupportedNaming.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/UnsupportedNaming.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,39 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.boot; + +import org.jboss.webbeans.resources.spi.NamingContext; + +/** + * + * @author Peter Royle + */ +public class UnsupportedNaming + implements NamingContext +{ + + public void bind( String name, Object value ) + { + throw new UnsupportedOperationException( "Not supported in SE environment." ); + } + + public <T> T lookup( String name, Class<? extends T> expectedType ) + { + throw new UnsupportedOperationException( "Not supported in SE environment." ); + } + +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/WebBeansBootstrap.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/WebBeansBootstrap.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/boot/WebBeansBootstrap.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,148 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.boot; + +import java.lang.annotation.Annotation; +import java.util.List; +import javax.inject.manager.Manager; +import javax.transaction.Transaction; +import org.jboss.webbeans.BeanValidator; +import org.jboss.webbeans.CurrentManager; +import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.bean.standard.InjectionPointBean; +import org.jboss.webbeans.bean.standard.ManagerBean; +import org.jboss.webbeans.bootstrap.BeanDeployer; +import org.jboss.webbeans.bootstrap.BeansXmlParser; +import org.jboss.webbeans.bootstrap.api.helpers.AbstractBootstrap; +import org.jboss.webbeans.environment.se.beans.ParametersFactory; +import org.jboss.webbeans.environment.se.discovery.WebBeanDiscoveryImpl; +import org.jboss.webbeans.environment.se.resources.DefaultResourceLoader; +import org.jboss.webbeans.literal.DeployedLiteral; +import org.jboss.webbeans.literal.InitializedLiteral; +import org.jboss.webbeans.log.Log; +import org.jboss.webbeans.log.Logging; + +/** + * Bootstrap class for for WebBeans in SE environment. Provides no JNDI binding. + * + * @author Peter Royle + */ +public class WebBeansBootstrap extends AbstractBootstrap +{ + + Log log = Logging.getLog( WebBeansBootstrap.class ); + String[] commandLineArgs; + private ManagerImpl manager; + + public WebBeansBootstrap( String[] commandLineArgs ) + { + setResourceLoader( new DefaultResourceLoader() ); + setEjbResolver( new UnsupportedEjbResolver() ); + setEjbDiscovery( new EmptyEjbDiscovery() ); + setNamingContext( new UnsupportedNaming() ); + setWebBeanDiscovery( new WebBeanDiscoveryImpl() ); + this.commandLineArgs = commandLineArgs; + + } + + @Override + public void initialize() + { + + if (getResourceLoader() == null) + { + throw new IllegalStateException( "ResourceLoader not set" ); + } + if (getNamingContext() == null) + { + throw new IllegalStateException( "NamingContext is not set" ); + } + if (getEjbResolver() == null) + { + throw new IllegalStateException( "EjbResolver is not set" ); + } + this.manager = new ManagerImpl( getNamingContext(), getEjbResolver(), getResourceLoader() ); + CurrentManager.setRootManager( manager ); + + } + + @Override + public Manager getManager() + { + return manager; + } + + @Override + public void boot() + { + synchronized (this) + { + log.info( "Starting Web Beans RI (SE environment) " ); + if (manager == null) + { + throw new IllegalStateException( "Manager has not been initialized" ); + } + if (getWebBeanDiscovery() == null) + { + throw new IllegalStateException( "WebBeanDiscovery not set" ); + } + if (getEjbDiscovery() == null) + { + throw new IllegalStateException( "EjbDiscovery is not set" ); + } + if (getResourceLoader() == null) + { + throw new IllegalStateException( "ResourceLoader not set" ); + } + BeansXmlParser parser = new BeansXmlParser( getResourceLoader(), getWebBeanDiscovery().discoverWebBeansXml() ); + parser.parse(); + List<Class<? extends Annotation>> enabledDeploymentTypes = parser.getEnabledDeploymentTypes(); + if (enabledDeploymentTypes != null) + { + manager.setEnabledDeploymentTypes( enabledDeploymentTypes ); + } + registerBeans( getWebBeanDiscovery().discoverWebBeanClasses() ); + + // grab the ParametersFactory and inject the given commandline arguments + ParametersFactory paramsFactory = + (ParametersFactory) CurrentManager.rootManager().getInstanceByType( ParametersFactory.class ); + paramsFactory.setArgs( this.commandLineArgs ); + + manager.fireEvent( manager, new InitializedLiteral() ); + log.info( "Web Beans initialized. Validating beans." ); + manager.getResolver().resolveInjectionPoints(); + new BeanValidator( manager ).validate(); + manager.fireEvent( manager, new DeployedLiteral() ); + } + } + + /** + * 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 = new BeanDeployer( manager ); + beanDeployer.addClasses( classes ); + beanDeployer.addBean( ManagerBean.of( manager ) ); + beanDeployer.addBean( InjectionPointBean.of( manager ) ); + beanDeployer.addClass( Transaction.class ); + beanDeployer.deploy(); + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractClassDeploymentHandler.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractClassDeploymentHandler.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractClassDeploymentHandler.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,42 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.util.HashSet; +import java.util.Set; + +public abstract class AbstractClassDeploymentHandler + extends AbstractDeploymentHandler + implements ClassDeploymentHandler +{ + private Set<ClassDescriptor> classes; + + public AbstractClassDeploymentHandler( ) + { + classes = new HashSet<ClassDescriptor>( ); + } + + public Set<ClassDescriptor> getClasses( ) + { + return classes; + } + + public void setClasses( Set<ClassDescriptor> classes ) + { + this.classes = classes; + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractDeploymentHandler.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractDeploymentHandler.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractDeploymentHandler.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,57 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.util.HashSet; +import java.util.Set; + +/** + * Abstract base class for {@link DeploymentHandler} providing common functionality + * + * @author Pete Muir + * + */ +public abstract class AbstractDeploymentHandler + implements DeploymentHandler +{ + private Set<FileDescriptor> resources; + + public AbstractDeploymentHandler( ) + { + resources = new HashSet<FileDescriptor>( ); + } + + @Override + public String toString( ) + { + return getName( ); + } + + public void setResources( Set<FileDescriptor> resources ) + { + this.resources = resources; + } + + public Set<FileDescriptor> getResources( ) + { + return resources; + } + + public void postProcess( ClassLoader classLoader ) + { + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractScanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractScanner.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/AbstractScanner.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,284 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import org.jboss.webbeans.environment.se.discovery.WebBeanDiscoveryException; +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; + +import java.io.DataInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.net.URL; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Map.Entry; +import java.util.Set; + +import javassist.bytecode.AnnotationsAttribute; +import javassist.bytecode.ClassFile; + +/** + * Abstract base class for {@link Scanner} providing common functionality + * + * This class provides file-system orientated scanning + * + * @author Pete Muir + * + */ +public abstract class AbstractScanner + implements Scanner +{ + private static class Handler + { + // Cache descriptors for performance + private ClassFile classFile; + private ClassDescriptor classDescriptor; + private FileDescriptor fileDescriptor; + private Set<FileDescriptor> fileDescriptors; + private Set<Entry<String, DeploymentHandler>> deploymentHandlers; + private ClassLoader classLoader; + private String name; + + public Handler( String name, Set<Entry<String, DeploymentHandler>> deploymentHandlers, ClassLoader classLoader ) + { + this.deploymentHandlers = deploymentHandlers; + this.name = name; + this.classLoader = classLoader; + } + + /** + * Return true if the file was handled (false if it was ignored) + */ + protected boolean handle( DeploymentHandler deploymentHandler ) + { + boolean handled = false; + + if ( deploymentHandler instanceof ClassDeploymentHandler ) + { + if ( name.endsWith( ".class" ) ) + { + ClassDeploymentHandler classDeploymentHandler = (ClassDeploymentHandler) deploymentHandler; + + if ( hasAnnotations( getClassFile( ), + classDeploymentHandler.getMetadata( ).getClassAnnotatedWith( ) ) ) + { + if ( getClassDescriptor( ).getClazz( ) != null ) + { + log.trace( "adding class to deployable list " + name + " for deployment handler " + + deploymentHandler.getName( ) ); + classDeploymentHandler.getClasses( ).add( getClassDescriptor( ) ); + handled = true; + } else + { + log.info( "skipping class " + name + + " because it cannot be loaded (may reference a type which is not available on the classpath)" ); + } + } + } + } else + { + if ( name.endsWith( deploymentHandler.getMetadata( ).getFileNameSuffix( ) ) ) + { + deploymentHandler.getResources( ).addAll( getAllFileDescriptors( ) ); + handled = true; + } + } + + return handled; + } + + protected boolean handle( ) + { + log.trace( "found " + name ); + + boolean handled = false; + + for ( Entry<String, DeploymentHandler> entry : deploymentHandlers ) + { + if ( handle( entry.getValue( ) ) ) + { + handled = true; + } + } + + return handled; + } + + private ClassFile getClassFile( ) + { + if ( classFile == null ) + { + try + { + classFile = loadClassFile( name, classLoader ); + } catch ( IOException e ) + { + throw new RuntimeException( "Error loading class file " + name, e ); + } + } + + return classFile; + } + + private ClassDescriptor getClassDescriptor( ) + { + if ( classDescriptor == null ) + { + classDescriptor = new ClassDescriptor( name, classLoader ); + } + + return classDescriptor; + } + + private FileDescriptor getFileDescriptor( ) + { + if ( fileDescriptor == null ) + { + fileDescriptor = new FileDescriptor( name, classLoader ); + } + + return fileDescriptor; + } + + private Set<FileDescriptor> getAllFileDescriptors( ) + { + if ( fileDescriptors == null ) + { + try + { + Enumeration<URL> allUrls = classLoader.getResources( name ); + Set<FileDescriptor> fileDescSet = new HashSet<FileDescriptor>( ); + + while ( allUrls.hasMoreElements( ) ) + { + fileDescSet.add( new FileDescriptor( + name, + allUrls.nextElement( ) ) ); + } + + this.fileDescriptors = fileDescSet; + } catch ( IOException ex ) + { + throw new WebBeanDiscoveryException( "Error loading all classpath urls for file " + name, ex ); + } + } + + return fileDescriptors; + } + } + + private static final LogProvider log = Logging.getLogProvider( Scanner.class ); + private DeploymentStrategy deploymentStrategy; + + public AbstractScanner( DeploymentStrategy deploymentStrategy ) + { + this.deploymentStrategy = deploymentStrategy; + ClassFile.class.getPackage( ); //to force loading of javassist, throwing an exception if it is missing + } + + protected AbstractScanner( ) + { + } + + protected static boolean hasAnnotations( ClassFile classFile, Set<Class<?extends Annotation>> annotationTypes ) + { + if ( annotationTypes.size( ) > 0 ) + { + AnnotationsAttribute visible = + (AnnotationsAttribute) classFile.getAttribute( AnnotationsAttribute.visibleTag ); + + if ( visible != null ) + { + for ( Class<?extends Annotation> annotationType : annotationTypes ) + { + if ( visible.getAnnotation( annotationType.getName( ) ) != null ) + { + return true; + } + } + } + } else + { + // If no annotations were specified, don't filter on annotations + // (note that this differs to the semantics used in Seam, where nothing would be matched) + return true; + } + + return false; + } + + /** + * Get a Javassist {@link ClassFile} for a given class name from the classLoader + */ + protected static ClassFile loadClassFile( String name, ClassLoader classLoader ) + throws IOException + { + if ( name == null ) + { + throw new NullPointerException( "name cannot be null" ); + } + + InputStream stream = classLoader.getResourceAsStream( name ); + + if ( stream == null ) + { + throw new IllegalStateException( "Cannot load " + name + " from " + classLoader + + " (using getResourceAsStream() returned null)" ); + } + + DataInputStream dstream = new DataInputStream( stream ); + + try + { + return new ClassFile( dstream ); + } finally + { + dstream.close( ); + stream.close( ); + } + } + + public DeploymentStrategy getDeploymentStrategy( ) + { + return deploymentStrategy; + } + + public long getTimestamp( ) + { + return Long.MAX_VALUE; + } + + protected void handleItem( String name ) + { + handle( name ); + } + + protected boolean handle( String name ) + { + return new Handler( name, + deploymentStrategy.getDeploymentHandlers( ).entrySet( ), + deploymentStrategy.getClassLoader( ) ).handle( ); + } + + public void scanDirectories( File[] directories, File[] excludedDirectories ) + { + scanDirectories( directories ); + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDeploymentHandler.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDeploymentHandler.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDeploymentHandler.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,29 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.util.Set; + +public interface ClassDeploymentHandler + extends DeploymentHandler +{ + public ClassDeploymentMetadata getMetadata( ); + + public Set<ClassDescriptor> getClasses( ); + + public void setClasses( Set<ClassDescriptor> classes ); +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDeploymentMetadata.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDeploymentMetadata.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDeploymentMetadata.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,35 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.lang.annotation.Annotation; +import java.util.Set; + +public interface ClassDeploymentMetadata + extends DeploymentMetadata +{ + /** + * An array of class annotations this deployment handler is interested in + * + * All classes with any of these annotations should be considered part of the + * match + * + * If this set is empty then all classes will be matched, whether they + * have annotations or not. + */ + public Set<Class<?extends Annotation>> getClassAnnotatedWith( ); +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDescriptor.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDescriptor.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/ClassDescriptor.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,101 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; + +import java.net.URL; + +public class ClassDescriptor + extends FileDescriptor +{ + private static LogProvider log = Logging.getLogProvider( ClassDescriptor.class ); + private Class<?> clazz; + + public ClassDescriptor( String name, URL url, Class<?> clazz ) + { + super( name, url ); + this.clazz = clazz; + } + + public ClassDescriptor( String name, ClassLoader classLoader ) + { + super( name, classLoader ); + + String classname = filenameToClassname( name ); + log.trace( "Trying to load class " + classname ); + + try + { + clazz = classLoader.loadClass( classname ); + // IBM JVM will throw a TypeNotPresentException if any annotation on the class is not on + // the classpath, rendering the class virtually unusable (given Seam's heavy use of annotations) + clazz.getAnnotations( ); + } catch ( ClassNotFoundException cnfe ) + { + log.info( "could not load class: " + classname, cnfe ); + } catch ( NoClassDefFoundError ncdfe ) + { + log.debug( "could not load class (missing dependency): " + classname, ncdfe ); + } catch ( TypeNotPresentException tnpe ) + { + clazz = null; + log.debug( "could not load class (annotation missing dependency): " + classname, tnpe ); + } + } + + public Class<?> getClazz( ) + { + return clazz; + } + + @Override + public String toString( ) + { + return clazz.getName( ); + } + + /** + * Convert a path to a class file to a class name + */ + public static String filenameToClassname( String filename ) + { + return filename.substring( 0, + filename.lastIndexOf( ".class" ) ).replace( '/', '.' ).replace( '\\', '.' ); + } + + @Override + public boolean equals( Object other ) + { + if ( other instanceof ClassDescriptor ) + { + ClassDescriptor that = (ClassDescriptor) other; + + return this.getClazz( ).equals( that.getClazz( ) ); + } else + { + return false; + } + } + + @Override + public int hashCode( ) + { + return getClazz( ).hashCode( ); + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentHandler.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentHandler.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentHandler.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,51 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.util.Set; + +/** + * A deployment handler is responsible for processing found resources + * + * All deployment handlers should specify a unique name under which they + * will be registered with the {@link DeploymentStrategy} + * + * @author Pete Muir + * + */ +public interface DeploymentHandler +{ + /** + * A key used to identify the deployment handler + */ + public String getName( ); + + /** + * Get DeploymentHandlerMetadata for resources this deployment handler is + * interested in processing. + * + * If a deployment handler is interested in a number of files it should + * define multiple pieces of metadata + */ + public DeploymentMetadata getMetadata( ); + + public void postProcess( ClassLoader classLoader ); + + public Set<FileDescriptor> getResources( ); + + public void setResources( Set<FileDescriptor> resources ); +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentMetadata.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentMetadata.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentMetadata.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,32 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + + +/** + * Metadata about resources the deployment handler is interested in + * + * @author pmuir + * + */ +public interface DeploymentMetadata +{ + /** + * A file name suffixes that this deployment handler is interested in + */ + public String getFileNameSuffix( ); +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentStrategy.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentStrategy.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/DeploymentStrategy.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,242 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; + +import java.io.File; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +/** + * A {@link DeploymentStrategy} coordinates the deployment of resources for a + * Web Beans SE application. + * + * @author Pete Muir + * + */ +public abstract class DeploymentStrategy +{ + private static final LogProvider log = Logging.getLogProvider( DeploymentStrategy.class ); + private Scanner scanner; + private List<File> files = new ArrayList<File>( ); + private Map<String, DeploymentHandler> deploymentHandlers; + + /** + * The key under which to list possible scanners. System properties take + * precedence over /META-INF/seam-scanner.properties. Entries will be tried + * in sequential order until a Scanner can be loaded. + * + * This can be specified as a System property or in + * /META-INF/seam-deployment.properties + */ + public static final String SCANNERS_KEY = "org.jboss.webbeans.environment.se.deployment.scanners"; + + /** + * Do the scan for resources + * + * Should only be called by Seam + * + */ + public abstract void scan( ); + + /** + * Get the scanner being used + * + */ + protected Scanner getScanner( ) + { + if ( scanner == null ) + { + initScanner( ); + } + + return scanner; + } + + /** + * Get the classloader to use + */ + public abstract ClassLoader getClassLoader( ); + + /** + * Get (or modify) any registered {@link DeploymentHandler}s + * + * Implementations of {@link DeploymentStrategy} may add default + * {@link DeploymentHandler}s + */ + public Map<String, DeploymentHandler> getDeploymentHandlers( ) + { + if ( deploymentHandlers == null ) + { + initDeploymentHandlers( ); + } + + return this.deploymentHandlers; + } + + private void initDeploymentHandlers( ) + { + this.deploymentHandlers = new HashMap<String, DeploymentHandler>( ); + + List<String> deploymentHandlersClassNames = + new WebBeansDeploymentProperties( getClassLoader( ) ).getPropertyValues( getDeploymentHandlersKey( ) ); + addHandlers( deploymentHandlersClassNames ); + } + + protected abstract String getDeploymentHandlersKey( ); + + protected void initScanner( ) + { + List<String> scanners = + new WebBeansDeploymentProperties( getClassLoader( ) ).getPropertyValues( SCANNERS_KEY ); + + for ( String className : scanners ) + { + Scanner scanner = instantiateScanner( className ); + + if ( scanner != null ) + { + log.debug( "Using " + scanner.toString( ) ); + this.scanner = scanner; + + return; + } + } + + log.debug( "Using default URLScanner" ); + this.scanner = new URLScanner( this ); + } + + private Scanner instantiateScanner( String className ) + { + try + { + Class<Scanner> scannerClass = (Class<Scanner>) getClassLoader( ).loadClass( className ); + Constructor<Scanner> constructor = scannerClass.getConstructor( new Class[] { DeploymentStrategy.class } ); + + return constructor.newInstance( new Object[] { this } ); + } catch ( ClassNotFoundException e ) + { + log.trace( "Unable to use " + className + " as scanner (class not found)", e ); + } catch ( NoClassDefFoundError e ) + { + log.trace( "Unable to use " + className + " as scanner (dependency not found)", e ); + } catch ( ClassCastException e ) + { + log.trace( "Unable to use " + className + + " as scanner (class does not implement org.jboss.seam.deployment.Scanner)" ); + } catch ( InstantiationException e ) + { + log.trace( "Unable to instantiate scanner " + className, e ); + } catch ( IllegalAccessException e ) + { + log.trace( "Unable to instantiate scanner " + className, e ); + } catch ( SecurityException e ) + { + log.trace( className + " must declare public " + className + + "( ClassLoader classLoader, String ... resourceNames )", e ); + } catch ( NoSuchMethodException e ) + { + log.trace( className + " must declare public " + className + + "( ClassLoader classLoader, String ... resourceNames )", e ); + } catch ( IllegalArgumentException e ) + { + log.trace( className + " must declare public " + className + + "( ClassLoader classLoader, String ... resourceNames )", e ); + } catch ( InvocationTargetException e ) + { + log.trace( className + " must declare public " + className + + "( ClassLoader classLoader, String ... resourceNames )", e ); + } + + return null; + } + + private void addHandlers( List<String> handlers ) + { + for ( String handler : handlers ) + { + addHandler( handler ); + } + } + + private void addHandler( String className ) + { + DeploymentHandler deploymentHandler = instantiateDeploymentHandler( className ); + + if ( deploymentHandler != null ) + { + log.debug( "Adding " + deploymentHandler + " as a deployment handler" ); + deploymentHandlers.put( deploymentHandler.getName( ), + deploymentHandler ); + } + } + + private DeploymentHandler instantiateDeploymentHandler( String className ) + { + try + { + Class<DeploymentHandler> clazz = (Class<DeploymentHandler>) getClassLoader( ).loadClass( className ); + + return clazz.newInstance( ); + } catch ( ClassNotFoundException e ) + { + log.trace( "Unable to use " + className + " as a deployment handler (class not found)", e ); + } catch ( NoClassDefFoundError e ) + { + log.trace( "Unable to use " + className + " as a deployment handler (dependency not found)", e ); + } catch ( InstantiationException e ) + { + log.trace( "Unable to instantiate deployment handler " + className, e ); + } catch ( IllegalAccessException e ) + { + log.trace( "Unable to instantiate deployment handler " + className, e ); + } + + return null; + } + + public List<File> getFiles( ) + { + return files; + } + + public void setFiles( List<File> files ) + { + this.files = files; + } + + public long getTimestamp( ) + { + return getScanner( ).getTimestamp( ); + } + + protected void postScan( ) + { + for ( Entry<String, DeploymentHandler> entry : getDeploymentHandlers( ).entrySet( ) ) + { + entry.getValue( ).postProcess( getClassLoader( ) ); + } + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/FileDescriptor.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/FileDescriptor.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/FileDescriptor.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,85 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.net.URL; + +public class FileDescriptor +{ + private String name; + private URL url; + + public FileDescriptor( String name, URL url ) + { + this.name = name; + this.url = url; + } + + public FileDescriptor( String name, ClassLoader classLoader ) + { + this.name = name; + + if ( name == null ) + { + throw new NullPointerException( "Name cannot be null, loading from " + classLoader ); + } + + this.url = classLoader.getResource( name ); + + if ( this.url == null ) + { + throw new NullPointerException( "Cannot find URL from classLoader for " + name + ", loading from " + + classLoader ); + } + } + + public String getName( ) + { + return name; + } + + public URL getUrl( ) + { + return url; + } + + @Override + public String toString( ) + { + return url.getPath( ); + } + + @Override + public boolean equals( Object other ) + { + if ( other instanceof FileDescriptor ) + { + FileDescriptor that = (FileDescriptor) other; + + return this.getUrl( ).equals( that.getUrl( ) ); + } else + { + return false; + } + } + + @Override + public int hashCode( ) + { + return getUrl( ).hashCode( ); + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/Scanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/Scanner.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/Scanner.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,59 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.io.File; + +/** + * The Scanner is used to find resources to be processed by Seam + * + * The processing is done by {@link DeploymentHandler}s + * + * @author Pete Muir + * + */ +public interface Scanner +{ + /** + * Recursively scan directories, skipping directories in the exclusion list. + * + * @param directories An array of the roots of the directory trees to scan + */ + public void scanDirectories( File[] directories ); + + /** + * Recursively scan directories, skipping directories in the exclusion list. + * + * @param directories An array of the roots of the directory trees to scan + * @param excludedDirectories Directories to skip over during the recursive scan + */ + public void scanDirectories( File[] directories, File[] excludedDirectories ); + + /** + * Scan for structures which contain any of the given resources in their root + * + * @param resources The resources to scan for + */ + public void scanResources( String[] resources ); + + /** + * Get the deployment strategy this scanner is used by + */ + public DeploymentStrategy getDeploymentStrategy( ); + + public long getTimestamp( ); +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/SimpleWebBeansDeploymentHandler.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/SimpleWebBeansDeploymentHandler.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/SimpleWebBeansDeploymentHandler.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,62 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.lang.annotation.Annotation; +import java.util.Collections; +import java.util.Set; + +/** + * The {@link SimpleWebBeansDeploymentHandler} processes all classes found in a + * Web Beans archive/folder. + * + * @author Pete Muir + * @author Peter Royle + * + */ +public class SimpleWebBeansDeploymentHandler + extends AbstractClassDeploymentHandler +{ + public static ClassDeploymentMetadata NAME_ANNOTATED_CLASS_METADATA = + new ClassDeploymentMetadata( ) + { + public Set<Class<?extends Annotation>> getClassAnnotatedWith( ) + { + return Collections.EMPTY_SET; + } + + public String getFileNameSuffix( ) + { + return null; + } + }; + + /** + * Name under which this {@link DeploymentHandler} is registered + */ + public static final String NAME = "org.jboss.webbeans.environment.se.deployment.SimpleWebBeansDeploymentHandler"; + + public String getName( ) + { + return NAME; + } + + public ClassDeploymentMetadata getMetadata( ) + { + return NAME_ANNOTATED_CLASS_METADATA; + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/StandardDeploymentStrategy.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/StandardDeploymentStrategy.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/StandardDeploymentStrategy.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,117 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import java.io.File; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * The standard deployment strategy used with Seam, deploys non-hot-deployable + * Seam components and namespaces + * + * @author Pete Muir + * + */ +public class StandardDeploymentStrategy + extends DeploymentStrategy +{ + private ClassLoader classLoader; + + /** + * The files used to identify a Seam archive + */ + public static final String[] RESOURCE_NAMES = { "beans.xml" }; + + /** + * The contextual variable name this deployment strategy is made available at + * during Seam startup. + */ + public static final String NAME = "deploymentStrategy"; + + /** + * The key under which to list extra deployment handlers. + * + * This can be specified as a System property or in + * /META-INF/seam-deployment.properties + */ + public static final String HANDLERS_KEY = "org.jboss.webbeans.environment.se.deployment.deploymentHandlers"; + private SimpleWebBeansDeploymentHandler simpleWebBeansDeploymentHandler; + private WebBeansXmlDeploymentHandler webBeansXmlDeploymentHandler; + + /** + * @param classLoader The classloader used to load and handle resources + */ + public StandardDeploymentStrategy( ClassLoader classLoader ) + { + this.classLoader = Thread.currentThread( ).getContextClassLoader( ); + simpleWebBeansDeploymentHandler = new SimpleWebBeansDeploymentHandler( ); + getDeploymentHandlers( ).put( SimpleWebBeansDeploymentHandler.NAME, simpleWebBeansDeploymentHandler ); + webBeansXmlDeploymentHandler = new WebBeansXmlDeploymentHandler( ); + getDeploymentHandlers( ).put( WebBeansXmlDeploymentHandler.NAME, webBeansXmlDeploymentHandler ); + } + + @Override + public ClassLoader getClassLoader( ) + { + return classLoader; + } + + @Override + protected String getDeploymentHandlersKey( ) + { + return HANDLERS_KEY; + } + + /** + * Get all annotated components known to this strategy + */ + public Set<ClassDescriptor> getSimpleWebBeans( ) + { + return Collections.unmodifiableSet( simpleWebBeansDeploymentHandler.getClasses( ) ); + } + + /** + * Get all beans.xml locations + */ + public Set<FileDescriptor> getWebBeansXMLs( ) + { + Set<FileDescriptor> fileDescriptors = new HashSet<FileDescriptor>( ); + fileDescriptors.addAll( webBeansXmlDeploymentHandler.getResources( ) ); + + return Collections.unmodifiableSet( fileDescriptors ); + } + + @Override + public void scan( ) + { + getScanner( ).scanResources( RESOURCE_NAMES ); + getScanner( ).scanDirectories( getFiles( ).toArray( new File[0] ) ); + postScan( ); + } + + // TODO (PR): what's the equivalent for Web Beans? +// public static StandardDeploymentStrategy instance() +// { +// if (Contexts.getEventContext().isSet(NAME)) +// { +// return (StandardDeploymentStrategy) Contexts.getEventContext().get(NAME); +// } +// return null; +// } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/URLScanner.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/URLScanner.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/URLScanner.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,217 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import org.jboss.webbeans.log.LogProvider; +import org.jboss.webbeans.log.Logging; + +import java.io.File; +import java.io.IOException; +import java.net.URL; +import java.net.URLClassLoader; +import java.net.URLDecoder; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Set; +import java.util.zip.ZipEntry; +import java.util.zip.ZipException; +import java.util.zip.ZipFile; + +/** + * Implementation of {@link Scanner} which can scan a {@link URLClassLoader} + * + * @author Thomas Heute + * @author Gavin King + * @author Norman Richards + * @author Pete Muir + * + */ +public class URLScanner + extends AbstractScanner +{ + private static final LogProvider log = Logging.getLogProvider( URLScanner.class ); + private long timestamp; + + public URLScanner( DeploymentStrategy deploymentStrategy ) + { + super( deploymentStrategy ); + } + + public void scanDirectories( File[] directories ) + { + scanDirectories( directories, + new File[0] ); + } + + @Override + public void scanDirectories( File[] directories, File[] excludedDirectories ) + { + for ( File directory : directories ) + { + handleDirectory( directory, null, excludedDirectories ); + } + } + + public void scanResources( String[] resources ) + { + Set<String> paths = new HashSet<String>( ); + + for ( String resourceName : resources ) + { + try + { + Enumeration<URL> urlEnum = getDeploymentStrategy( ).getClassLoader( ).getResources( resourceName ); + + while ( urlEnum.hasMoreElements( ) ) + { + String urlPath = urlEnum.nextElement( ).getFile( ); + urlPath = URLDecoder.decode( urlPath, "UTF-8" ); + + if ( urlPath.startsWith( "file:" ) ) + { + urlPath = urlPath.substring( 5 ); + } + + if ( urlPath.indexOf( '!' ) > 0 ) + { + urlPath = + urlPath.substring( 0, + urlPath.indexOf( '!' ) ); + } else + { + File dirOrArchive = new File( urlPath ); + + if ( ( resourceName != null ) && ( resourceName.lastIndexOf( '/' ) > 0 ) ) + { + //for META-INF/components.xml + dirOrArchive = dirOrArchive.getParentFile( ); + } + + urlPath = dirOrArchive.getParent( ); + } + + paths.add( urlPath ); + } + } catch ( IOException ioe ) + { + log.warn( "could not read: " + resourceName, ioe ); + } + } + + handle( paths ); + } + + protected void handle( Set<String> paths ) + { + for ( String urlPath : paths ) + { + try + { + log.trace( "scanning: " + urlPath ); + + File file = new File( urlPath ); + + if ( file.isDirectory( ) ) + { + handleDirectory( file, null ); + } else + { + handleArchiveByFile( file ); + } + } catch ( IOException ioe ) + { + log.warn( "could not read entries", ioe ); + } + } + } + + private void handleArchiveByFile( File file ) + throws IOException + { + try + { + log.trace( "archive: " + file ); + touchTimestamp( file ); + + ZipFile zip = new ZipFile( file ); + Enumeration<?extends ZipEntry> entries = zip.entries( ); + + while ( entries.hasMoreElements( ) ) + { + ZipEntry entry = entries.nextElement( ); + String name = entry.getName( ); + handle( name ); + } + } catch ( ZipException e ) + { + throw new RuntimeException( "Error handling file " + file, e ); + } + } + + private void handleDirectory( File file, String path ) + { + handleDirectory( file, + path, + new File[0] ); + } + + private void handleDirectory( File file, String path, File[] excludedDirectories ) + { + for ( File excludedDirectory : excludedDirectories ) + { + if ( file.equals( excludedDirectory ) ) + { + log.trace( "skipping excluded directory: " + file ); + + return; + } + } + + log.trace( "handling directory: " + file ); + + for ( File child : file.listFiles( ) ) + { + String newPath = ( path == null ) ? child.getName( ) : ( path + '/' + child.getName( ) ); + + if ( child.isDirectory( ) ) + { + handleDirectory( child, newPath, excludedDirectories ); + } else + { + if ( handle( newPath ) ) + { + // only try to update the timestamp on this scanner if the file was actually handled + touchTimestamp( child ); + } + } + } + } + + private void touchTimestamp( File file ) + { + if ( file.lastModified( ) > timestamp ) + { + timestamp = file.lastModified( ); + } + } + + @Override + public long getTimestamp( ) + { + return timestamp; + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/WebBeansDeploymentProperties.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/WebBeansDeploymentProperties.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/WebBeansDeploymentProperties.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,136 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + +import org.jboss.webbeans.environment.se.util.EnumerationEnumeration; +import static org.jboss.webbeans.util.Strings.split; + +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.Properties; + +public class WebBeansDeploymentProperties +{ + private ClassLoader classLoader; + private Enumeration<URL> urlEnum; + + public WebBeansDeploymentProperties( ClassLoader classLoader ) + { + this.classLoader = classLoader; + } + + /** + * The resource bundle used to control Seam deployment + */ + public static final String RESOURCE_BUNDLE = "META-INF/seam-deployment.properties"; + + // All resource bundles to use, including legacy names + private static final String[] RESOURCE_BUNDLES = { RESOURCE_BUNDLE, "META-INF/seam-scanner.properties" }; + + /** + * Get a list of possible values for a given key. + * + * First, System properties are tried, followed by the specified resource + * bundle (first in classpath only). + * + * Colon (:) deliminated lists are split out. + * + */ + public List<String> getPropertyValues( String key ) + { + List<String> values = new ArrayList<String>( ); + addPropertiesFromSystem( key, values ); + addPropertiesFromResourceBundle( key, values ); + + return values; + } + + private void addPropertiesFromSystem( String key, List<String> values ) + { + addProperty( key, + System.getProperty( key ), + values ); + } + + private void addPropertiesFromResourceBundle( String key, List<String> values ) + { + try + { + while ( getResources( ).hasMoreElements( ) ) + { + URL url = getResources( ).nextElement( ); + Properties properties = new Properties( ); + InputStream propertyStream = url.openStream( ); + + try + { + properties.load( propertyStream ); + addProperty( key, + properties.getProperty( key ), + values ); + } finally + { + if ( propertyStream != null ) + { + propertyStream.close( ); + } + } + } + } catch ( IOException e ) + { + // No - op, file is optional + } + } + + /* + * Add the property to the set of properties only if it hasn't already been added + */ + private void addProperty( String key, String value, List<String> values ) + { + if ( value != null ) + { + String[] properties = split( value, ":" ); + + for ( String property : properties ) + { + values.add( property ); + } + } + } + + private Enumeration<URL> getResources( ) + throws IOException + { + if ( urlEnum == null ) + { + Enumeration<URL>[] enumerations = new Enumeration[RESOURCE_BUNDLES.length]; + + for ( int i = 0; i < RESOURCE_BUNDLES.length; i++ ) + { + enumerations[i] = classLoader.getResources( RESOURCE_BUNDLES[i] ); + } + + urlEnum = new EnumerationEnumeration<URL>( enumerations ); + } + + return urlEnum; + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/WebBeansXmlDeploymentHandler.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/WebBeansXmlDeploymentHandler.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/deployment/WebBeansXmlDeploymentHandler.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,52 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.deployment; + + +/** + * The {@link WebBeansXmlDeploymentHandler} beans.xml files + * + * @author Pete Muir + * + */ +public class WebBeansXmlDeploymentHandler + extends AbstractDeploymentHandler +{ + private static DeploymentMetadata WEBBEANSXML_SUFFIX_FILE_METADATA = + new DeploymentMetadata( ) + { + public String getFileNameSuffix( ) + { + return "beans.xml"; + } + }; + + /** + * Name under which this {@link DeploymentHandler} is registered + */ + public static final String NAME = "org.jboss.webbeans.environment.se.deployment.WebBeansXmlDeploymentHandler"; + + public String getName( ) + { + return NAME; + } + + public DeploymentMetadata getMetadata( ) + { + return WEBBEANSXML_SUFFIX_FILE_METADATA; + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryException.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryException.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryException.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,42 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.discovery; + + +/** + * Thrown if there's an error during Web Bean discoery that will stop the + * manager from starting up. + * @author Peter Royle + */ +public class WebBeanDiscoveryException + extends RuntimeException +{ + public WebBeanDiscoveryException( Throwable cause ) + { + super( cause ); + } + + public WebBeanDiscoveryException( String message, Throwable cause ) + { + super( message, cause ); + } + + public WebBeanDiscoveryException( String message ) + { + super( message ); + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryImpl.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryImpl.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/WebBeanDiscoveryImpl.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,88 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.discovery; + +import org.apache.log4j.Logger; + +import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; +import org.jboss.webbeans.environment.se.deployment.ClassDescriptor; +import org.jboss.webbeans.environment.se.deployment.FileDescriptor; +import org.jboss.webbeans.environment.se.deployment.StandardDeploymentStrategy; + +import java.net.URL; +import java.util.HashSet; +import java.util.Set; + +/** + * The means by which Web Beans are discovered on the classpath. This will only + * discover simple web beans - there is no EJB/Servlet/JPA integration. + * @author Peter Royle. + * Adapted from org.jboss.webbeans.integration.jbossas.WebBeansDiscoveryImpl (author unknown) + */ +public class WebBeanDiscoveryImpl + implements WebBeanDiscovery +{ + private Set<Class<?>> wbClasses = new HashSet<Class<?>>( ); + private Set<URL> wbUrls = new HashSet<URL>( ); + private StandardDeploymentStrategy deploymentStrategy; + + // The log provider + private static Logger log = Logger.getLogger( WebBeanDiscoveryImpl.class.getName( ) ); + + public WebBeanDiscoveryImpl( ) + { + deploymentStrategy = new StandardDeploymentStrategy( Thread.currentThread( ).getContextClassLoader( ) ); + deploymentStrategy.scan( ); + + findWebBeansXmlUrls( ); + findWebBeansAnnotatedClasses( ); + } + + public Iterable<EjbDescriptor<?>> discoverEjbs( ) + { + return new HashSet<EjbDescriptor<?>>( ); + } + + public Iterable<Class<?>> discoverWebBeanClasses( ) + { + return wbClasses; + } + + public Iterable<URL> discoverWebBeansXml( ) + { + return wbUrls; + } + + private void findWebBeansAnnotatedClasses( ) + throws WebBeanDiscoveryException + { + for ( ClassDescriptor classDesc : deploymentStrategy.getSimpleWebBeans( ) ) + { + final Class<?> clazz = classDesc.getClazz( ); + wbClasses.add( clazz ); + } + } + + private void findWebBeansXmlUrls( ) + { + for ( FileDescriptor fileDesc : deploymentStrategy.getWebBeansXMLs( ) ) + { + wbUrls.add( fileDesc.getUrl( ) ); + } + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Setup.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Setup.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Setup.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,30 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.events; + + +/** + * The event which is fired after the manager initialises but before the + * "Start" event is fired (causing the application to begin). + * Applications may observe this event in order to perform any additional setup + * necessary, however it is most useful for setup required to make injection + * of certain custom beans possible - for example: setting up custom contexts. + * @author Peter Royle + */ +public class Setup +{ +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Shutdown.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,30 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.events; + +/** + * Fired by webbeans SE before shutting down. Applications and modules should + * release resources cleanly in response to this event. + * @author Peter Royle + */ +public class Shutdown +{ + + public Shutdown() + { + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Start.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Start.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/events/Start.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,28 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.events; + + +/** + * The event which is fired after the manager initialises and is ready for the + * application to start. Applications should provide a method which observes + * this event as a means of starting the application. + * @author Peter Royle + */ +public class Start +{ +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/resources/DefaultResourceLoader.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/resources/DefaultResourceLoader.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/resources/DefaultResourceLoader.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.resources; + +import java.io.IOException; +import java.net.URL; + +import org.jboss.webbeans.resources.spi.ResourceLoader; +import org.jboss.webbeans.resources.spi.ResourceLoadingException; +import org.jboss.webbeans.util.EnumerationIterable; + +/** + * A simple resource loader. + * + * Uses {@link DefaultResourceLoader}'s classloader if the Thread Context + * Classloader isn't available + * + * @author Pete Muir + * + */ +public class DefaultResourceLoader implements ResourceLoader +{ + + public Class<?> classForName(String name) + { + + try + { + if (Thread.currentThread().getContextClassLoader() != null) + { + return Thread.currentThread().getContextClassLoader().loadClass(name); + } + else + { + return Class.forName(name); + } + } + catch (ClassNotFoundException e) + { + throw new ResourceLoadingException(e); + } + catch (NoClassDefFoundError e) + { + throw new ResourceLoadingException(e); + } + } + + public URL getResource(String name) + { + if (Thread.currentThread().getContextClassLoader() != null) + { + return Thread.currentThread().getContextClassLoader().getResource(name); + } + else + { + return getClass().getResource(name); + } + } + + public Iterable<URL> getResources(String name) + { + try + { + if (Thread.currentThread().getContextClassLoader() != null) + { + return new EnumerationIterable<URL>(Thread.currentThread().getContextClassLoader().getResources(name)); + } + else + { + return new EnumerationIterable<URL>(getClass().getClassLoader().getResources(name)); + } + } + catch (IOException e) + { + throw new ResourceLoadingException(e); + } + } + +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/EnumerationEnumeration.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/EnumerationEnumeration.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/util/EnumerationEnumeration.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,85 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.environment.se.util; + +import java.util.Enumeration; +import java.util.NoSuchElementException; + +public class EnumerationEnumeration<T> + implements Enumeration<T> +{ + private Enumeration<T>[] enumerations; + private int loc = 0; + + public EnumerationEnumeration( Enumeration<T>[] enumerations ) + { + this.enumerations = enumerations; + } + + public boolean hasMoreElements( ) + { + for ( int i = loc; i < enumerations.length; i++ ) + { + if ( enumerations[i].hasMoreElements( ) ) + { + return true; + } + } + + return false; + } + + public T nextElement( ) + { + while ( isCurrentEnumerationAvailable( ) ) + { + if ( currentHasMoreElements( ) ) + { + return currentNextElement( ); + } else + { + nextEnumeration( ); + } + } + + throw new NoSuchElementException( ); + } + + private void nextEnumeration( ) + { + loc++; + } + + /*private boolean isNextEnumerationAvailable() + { + return loc < enumerations.length-1; + }*/ + private boolean isCurrentEnumerationAvailable( ) + { + return loc < enumerations.length; + } + + private T currentNextElement( ) + { + return enumerations[loc].nextElement( ); + } + + private boolean currentHasMoreElements( ) + { + return enumerations[loc].hasMoreElements( ); + } +} Added: extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java =================================================================== --- extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java (rev 0) +++ extensions/trunk/se/src/main/java/org/jboss/webbeans/lifecycle/ApplicationLifecycle.java 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,85 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.lifecycle; + +import org.jboss.webbeans.CurrentManager; +import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.context.ApplicationContext; +import org.jboss.webbeans.context.DependentContext; +import org.jboss.webbeans.context.beanmap.BeanMap; +import org.jboss.webbeans.environment.se.events.Shutdown; +import org.jboss.webbeans.log.Log; +import org.jboss.webbeans.log.Logging; + +/** + * Implements the lifecycle methods for a WebBeans SE application. + * @author Peter Royle + */ +public class ApplicationLifecycle +{ + + private static ApplicationLifecycle instance; + Log log = Logging.getLog( ApplicationLifecycle.class ); + + + static + { + instance = new ApplicationLifecycle(); + } + + public static ApplicationLifecycle instance() + { + return instance; + } + + public void initialize() + { + ManagerImpl manager = CurrentManager.rootManager(); + if (manager == null) + { + throw new IllegalStateException( "Manager has not been initialized, " + + "check that Bootstrap.initialize() has run" ); + } + manager.addContext( DependentContext.create() ); + manager.addContext( ApplicationContext.create() ); + } + + public void beginApplication( String id, BeanMap applicationBeanMap ) + { + log.trace( "Starting application " + id ); + ApplicationContext.INSTANCE.setBeanMap( applicationBeanMap ); + ApplicationContext.INSTANCE.setActive( true ); + // TODO (PR): I have no idea if this is OK??? The WB spec says that the + // dependant scoe is only active when the manager is doing its work. + // This leaves it open for the whole duration. I guess that's about + // right since the main bean is in the dependant scope? + DependentContext.INSTANCE.setActive( true ); + } + + public void endApplication( String id, BeanMap applicationBeanMap ) + { + log.trace( "Ending application " + id ); + + // Give apps and modules a chance to shutdown cleanly + CurrentManager.rootManager().fireEvent( new Shutdown() ); + + ApplicationContext.INSTANCE.destroy(); + ApplicationContext.INSTANCE.setActive( false ); + ApplicationContext.INSTANCE.setBeanMap( null ); + + } +} Added: extensions/trunk/se/src/main/resources/beans.xml =================================================================== --- extensions/trunk/se/src/main/resources/beans.xml (rev 0) +++ extensions/trunk/se/src/main/resources/beans.xml 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,19 @@ + +<beans></beans> Added: extensions/trunk/se/src/main/resources/log4j.properties =================================================================== --- extensions/trunk/se/src/main/resources/log4j.properties (rev 0) +++ extensions/trunk/se/src/main/resources/log4j.properties 2009-02-24 00:11:39 UTC (rev 1666) @@ -0,0 +1,25 @@ +# +# JBoss, Home of Professional Open Source +# Copyright 2008, Red Hat Middleware LLC, and individual contributors +# by the @authors tag. See the copyright.txt in the distribution for a +# full listing of individual contributors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Set root logger level to DEBUG and its only appender to A1. +log4j.rootLogger=TRACE, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n

17 years, 1 month

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1665 - ri/trunk.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-02-23 18:50:21 -0500 (Mon, 23 Feb 2009) New Revision: 1665 Modified: ri/trunk/pom.xml Log: specify plugin version Modified: ri/trunk/pom.xml =================================================================== --- ri/trunk/pom.xml 2009-02-23 22:57:59 UTC (rev 1664) +++ ri/trunk/pom.xml 2009-02-23 23:50:21 UTC (rev 1665) @@ -466,6 +466,11 @@ <version>2.2</version> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.4</version> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>emma-maven-plugin</artifactId> <version>1.0-alpha-1</version>

17 years, 1 month

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits February 2009