October 2009 - weld-commits - Jboss List Archives

Weld SVN: r4131 - in cdi-tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method and 14 other directories.

by weld-commits＠lists.jboss.org

Author: norman.richards(a)jboss.com Date: 2009-10-15 22:59:08 -0400 (Thu, 15 Oct 2009) New Revision: 4131 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/invocation/beans.xml Log: tck updates Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/EJBDecoratorInvocationTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -43,8 +43,7 @@ @SpecAssertion(section="8.5", id="b"), @SpecAssertion(section="8.1.3", id="d"), @SpecAssertion(section="8.1.2", id="f"), - @SpecAssertion(section="8.1.2", id="b"), - @SpecAssertion(section="7.2", id="d") + @SpecAssertion(section="8.1.2", id="b") }) public void testDecoratorInvocation() { @@ -57,6 +56,18 @@ @Test @SpecAssertions({ + @SpecAssertion(section="7.2", id="d") + }) + public void testEJBDecoratorInvocation() { + // testDecoratorInvocation tests decorators of normal beans called from an EJB + // it doesn't test actual decoration of the EJB + PigStyDecorator.decoratorCalled = false; + getInstanceByType(PigSty.class).clean(); + assert PigStyDecorator.decoratorCalled; + } + + @Test + @SpecAssertions({ @SpecAssertion(section="8.5", id="d"), @SpecAssertion(section="8.5", id="e"), @SpecAssertion(section="8.5", id="f"), Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/PigStyDecorator.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.decorators.invocation; + +import javax.decorator.Decorates; +import javax.decorator.Decorator; + +@Decorator +public class PigStyDecorator implements PigSty { + public static boolean decoratorCalled = false; + + @Decorates PigSty pigSty; + + public void clean() { + decoratorCalled = true; + pigSty.clean(); + } + + public void washDown() { + decoratorCalled = true; + pigSty.washDown(); + } + +} Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerDecorator.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -29,11 +29,11 @@ { @Decorates - private Producer logger; + private Producer producer; public Foo produce() { - return new Foo(logger.produce().getFoo() + "!!"); + return new Foo(producer.produce().getFoo() + "!!"); } /** @@ -46,7 +46,7 @@ public void dispose(Foo foo) { - logger.dispose(new Foo("decorated")); + producer.dispose(new Foo("decorated")); } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -42,7 +42,7 @@ @SpecAssertion(section = "2", id = "b"), @SpecAssertion(section = "11.1", id = "ba") }) - public void testBindingTypesNonEmpty() + public void testQualifiersNonEmpty() { assert getBeans(RedSnapper.class).size() == 1; assert getBeans(RedSnapper.class).iterator().next().getQualifiers().size() > 0; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/name/NameDefinitionTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -46,7 +46,7 @@ @SpecAssertion(section = "2.7", id = "a"), @SpecAssertion(section = "2.7.1.3", id = "aaa") }) - public void testSterotypeDefaultsName() + public void testStereotypeDefaultsName() { assert getBeans(RedSnapper.class).size() == 1; Bean<RedSnapper> bean = getBeans(RedSnapper.class).iterator().next(); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/scope/ScopeDefinitionTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -82,7 +82,7 @@ } @Test @SpecAssertion(section="2.4.4", id = "da") - public void testMutipleIncompatibleScopeStereotypesWithScopeSpecified() + public void testMultipleIncompatibleScopeStereotypesWithScopeSpecified() { assert getBeans(Pollock.class).size() == 1; Bean<Pollock> bean = getBeans(Pollock.class).iterator().next(); @@ -90,7 +90,7 @@ } @Test @SpecAssertion(section="2.4.4", id = "c") - public void testMutipleCompatibleScopeStereotypes() + public void testMultipleCompatibleScopeStereotypes() { assert getBeans(Grayling.class).size() == 1; Bean<Grayling> bean = getBeans(Grayling.class).iterator().next(); @@ -102,7 +102,7 @@ @SpecAssertion(section = "2.7.2", id = "db"), @SpecAssertion(section = "4.1", id = "ab") }) - public void testCDIScopeTypeOverridesStereotype() + public void testWebBeanScopeTypeOverridesStereotype() { assert getBeans(RedSnapper.class).size() == 1; Bean<RedSnapper> bean = getBeans(RedSnapper.class).iterator().next(); Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/HighlandCow.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -1,9 +1,7 @@ package org.jboss.jsr299.tck.tests.definition.stereotype; -import javax.enterprise.context.RequestScoped; - @HornedMammalStereotype -@RequestScoped +@AnimalStereotype @Tame class HighlandCow implements Animal { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/Springbok.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -1,9 +1,9 @@ package org.jboss.jsr299.tck.tests.definition.stereotype; -import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.context.RequestScoped; @ApplicationScopedHornedMammalStereotype -@ApplicationScoped +@RequestScoped class Springbok implements Animal { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -71,7 +71,7 @@ public void testExplicitScopeOverridesMergedScopesFromMultipleStereotype() { assert getBeans(Springbok.class).size() == 1; - assert getBeans(Springbok.class).iterator().next().getScope().equals(ApplicationScoped.class); + assert getBeans(Springbok.class).iterator().next().getScope().equals(RequestScoped.class); } @Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/broken/scopeConflict/IncompatibleStereotypesTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -18,7 +18,7 @@ @SpecAssertions( { @SpecAssertion(section = "2.4.4", id = "da") }) - public void testMutipleIncompatibleScopeStereotypes() + public void testMultipleIncompatibleScopeStereotypes() { assert false; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -35,11 +35,14 @@ }) public void testBindingTypesAppliedToDisposalMethodParameters() throws Exception { + assert !SpiderProducer.isTameSpiderDestroyed(); + assert !SpiderProducer.isDeadliestSpiderDestroyed(); Bean<Tarantula> tarantula = getBeans(Tarantula.class, DEADLIEST_LITERAL).iterator().next(); CreationalContext<Tarantula> creationalContext = getCurrentManager().createCreationalContext(tarantula); Tarantula instance = tarantula.create(creationalContext); tarantula.destroy(instance, creationalContext); assert SpiderProducer.isTameSpiderDestroyed(); + assert SpiderProducer.isDeadliestSpiderDestroyed(); } @Test Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -44,7 +44,7 @@ @SpecAssertions( { @SpecAssertion(section = "7.3.2", id = "aa"), @SpecAssertion(section = "7.3.2", id = "bb"), - @SpecAssertion(section = "7.3.3", id = "b"), + //@SpecAssertion(section = "7.3.3", id = "b"), @SpecAssertion(section = "6.5.3", id = "b"), @SpecAssertion(section = "12.1", id="bba") }) @@ -103,6 +103,7 @@ Context requestContext = getCurrentManager().getContext(RequestScoped.class); CreationalContext<KleinStadt> creationalContext = getCurrentManager().createCreationalContext(stadtBean); KleinStadt kassel = stadtBean.create(creationalContext); + assert requestContext.get(stadtBean) != null : "bean exists in request context"; kassel.ping(); stadtBean.destroy(kassel, creationalContext); @@ -119,6 +120,7 @@ }) public void testRemovedEjbIgnored() { + assert false; KleinStadt stadtInstance = getInstanceByType(KleinStadt.class, new AnnotationLiteral<Important>() {}); assert stadtInstance != null : "Expected instance to be created by container"; stadtInstance.setName("Kassel-Wilhelmshoehe"); @@ -131,7 +133,8 @@ } @Test(groups = { "enterpriseBeans", "lifecycle", "integration" }) - @SpecAssertion(section = "7.3.3", id = "a") + @SpecAssertions({ + @SpecAssertion(section = "7.3.3", id = "b")}) public void testCreateSLSB() { Bean<NeueStadt> stadtBean = getBeans(NeueStadt.class).iterator().next(); @@ -145,6 +148,16 @@ assert interfaces.contains(NeueStadt.class); assert interfaces.contains(GeschichtslosStadt.class); } + + @Test(groups = { "enterpriseBeans", "clientProxy", "lifecycle", "integration" }) + @SpecAssertions({ + @SpecAssertion(section = "7.3.3", id = "c") + }) + public void testDestroyDiscardsSLSB() throws Exception + { + // stub for test + assert false; + } @Test(groups = { "enterpriseBeans", "lifecycle", "integration" }) @SpecAssertion(section = "3.9.2", id = "b") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/Giessen.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -1,5 +1,9 @@ package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle; + +import javax.ejb.Stateless; + +@Stateless public class Giessen implements NeueStadt, GeschichtslosStadt { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -1,6 +1,10 @@ package org.jboss.jsr299.tck.tests.implementation.producer.field.lifecycle; import javax.enterprise.inject.IllegalProductException; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.context.spi.CreationalContext; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.test.audit.annotations.SpecAssertion; @@ -15,7 +19,9 @@ @SpecVersion(spec="cdi", version="PFD2") public class ProducerFieldLifecycleTest extends AbstractJSR299Test { - + private AnnotationLiteral<Null> NULL_LITERAL = new AnnotationLiteral<Null>() {}; + private AnnotationLiteral<Broken> BROKEN_LITERAL = new AnnotationLiteral<Broken>() {}; + @Test(groups = { "producerField" }) @SpecAssertions({ @SpecAssertion(section = "3.4", id = "aa") // removed from spec @@ -69,7 +75,20 @@ NullSpiderConsumer consumerBean = getInstanceByType(NullSpiderConsumer.class); assert consumerBean.getInjectedSpider() == null; } + + @Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class) + @SpecAssertions({ + @SpecAssertion(section = "7.3.5", id = "n") + }) + public void testProducerFieldForNullValueNotDependent() throws Exception { + Bean<BlackWidow> spiderBean = getBeans(BlackWidow.class, NULL_LITERAL, BROKEN_LITERAL).iterator().next(); + CreationalContext<BlackWidow> spiderContext = getCurrentManager().createCreationalContext(spiderBean); + spiderBean.create(spiderContext); + + assert false; + } + @Test(groups = { "producerField" }, expectedExceptions = IllegalProductException.class) @SpecAssertions({ @SpecAssertion(section = "3.4", id = "e"), Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/Lays.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -5,8 +5,8 @@ class Lays { - public @Produces @RequestScoped PotatoChip makeChip() - { + public @Produces @Null @RequestScoped PotatoChip makeChip() + { return null; } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -105,18 +105,9 @@ }) public void testCreateFailsIfProducerReturnsNullAndNotDependent() { - // QUESTION is there an easier way to get the producer method bean instead of the top-level (dependent) type? - Bean<PotatoChip> potatoChipBean = null; - for (Bean<PotatoChip> candidate : getBeans(PotatoChip.class)) - { - if (candidate.getScope().equals(RequestScoped.class)) - { - potatoChipBean = candidate; - break; - } - } - + Bean<PotatoChip> potatoChipBean = getBeans(PotatoChip.class, NULL_LITERAL).iterator().next(); assert potatoChipBean != null; + CreationalContext<PotatoChip> chipCc = getCurrentManager().createCreationalContext(potatoChipBean); potatoChipBean.create(chipCc); assert false; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -173,7 +173,11 @@ { assert getBeans(TunaFarm.class).size() == 1; TunaFarm tunaFarm = getInstanceByType(TunaFarm.class); - assert tunaFarm.tuna != null; + assert tunaFarm.tuna != null; + assert tunaFarm.tuna.getName().equals("Ophir"); + + assert tunaFarm.qualifiedTuna != null; + assert tunaFarm.qualifiedTuna.getName().equals("qualifiedTuna"); } @Test(groups = "beanLifecycle") Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/Tuna.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -5,7 +5,6 @@ @RequestScoped class Tuna { - public String getName() { return "Ophir"; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/TunaFarm.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -9,7 +9,11 @@ @Inject public Tuna tuna; + + @SuppressWarnings("unused") + @Inject @Tame + public Tuna qualifiedTuna; + public Tuna notInjectedTuna = new Tuna(); - } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -20,14 +20,15 @@ import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Target; +import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.ArrayList; import javax.enterprise.inject.AnnotationLiteral; +import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InterceptionType; import javax.enterprise.inject.spi.Interceptor; @@ -36,8 +37,6 @@ import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.jsr299.BeansXml; - import org.testng.annotations.Test; /** @@ -45,24 +44,23 @@ * their execution. * * @author David Allen - * @author Marius Bogoevici + * */ @Artifact -@SpecVersion(spec = "cdi", version = "PFD2") -@BeansXml("beans.xml") +@SpecVersion(spec="cdi", version="PFD2") public class InterceptorDefinitionTest extends AbstractJSR299Test { - @Test + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.1.2", id = "a") + @SpecAssertion(section = "11.1.2", id = "a") }) // WBRI-59 public void testInterceptorsImplementInterceptorInterface() { boolean interfaceFound = false; - for (Type type : getInterfacesImplemented(getTransactionalInterceptor().getClass())) + for (Type type : getInterfacesImplemented(getBeans(TransactionalInterceptor.class).iterator().next().getClass())) { - if (type instanceof ParameterizedTypeImpl && ((ParameterizedTypeImpl)type).getRawType().equals(Interceptor.class)) + if (type.equals(Interceptor.class)) { interfaceFound = true; break; @@ -70,28 +68,35 @@ } assert interfaceFound; } - - @Test + + private Set<Type> getInterfacesImplemented(Class<?> clazz) + { + Set<Type> interfaces = new HashSet<Type>(); + interfaces.addAll(new HierarchyDiscovery(clazz).getFlattenedTypes()); + return interfaces; + } + + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.1.2", id = "b") + @SpecAssertion(section = "11.1.2", id = "b") }) // WBRI-59 public void testInterceptorBindingTypes() { - Interceptor<?> interceptorBean = getTransactionalInterceptor(); + Interceptor<?> interceptorBean = (Interceptor<?>) getBeans(TransactionalInterceptor.class).iterator().next(); assert interceptorBean.getInterceptorBindingTypes().size() == 1; - assert interceptorBean.getInterceptorBindingTypes().contains(new AnnotationLiteral<Transactional>(){}); + assert interceptorBean.getInterceptorBindingTypes().contains(Transactional.class); } - @Test + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.1.2", id = "c"), - @SpecAssertion(section = "11.1.2", id = "e") + @SpecAssertion(section = "11.1.2", id = "c"), + @SpecAssertion(section = "11.1.2", id = "e") }) // WBRI-59 public void testInterceptionType() { - Interceptor<?> interceptorBean = getTransactionalInterceptor(); + Interceptor<?> interceptorBean = (Interceptor<?>) getBeans(TransactionalInterceptor.class).iterator().next(); assert interceptorBean.intercepts(InterceptionType.AROUND_INVOKE); assert !interceptorBean.intercepts(InterceptionType.POST_ACTIVATE); assert !interceptorBean.intercepts(InterceptionType.POST_CONSTRUCT); @@ -99,61 +104,24 @@ assert !interceptorBean.intercepts(InterceptionType.PRE_PASSIVATE); } - @Test + @Test(groups = "ri-broken") @SpecAssertion(section = "11.1.2", id = "f") // WBRI-59 public void testInstanceOfInterceptorForEveryEnabledInterceptor() { - List<AnnotationLiteral<?>> annotationLiterals = Arrays.<AnnotationLiteral<?>>asList( - new AnnotationLiteral<Transactional>(){}, - new AnnotationLiteral<Secure>(){}, - new AnnotationLiteral<MissileBinding>(){}, - new AnnotationLiteral<Logged>(){}); - - List<Class<?>> interceptorClasses = new ArrayList<Class<?>>(Arrays.<Class<?>>asList( - AtomicInterceptor.class, - MissileInterceptor.class, - SecureInterceptor.class, - TransactionalInterceptor.class, - NetworkLogger.class, - FileLogger.class, - NotEnabledAtomicInterceptor.class - )); - - for (AnnotationLiteral<?> annotationLiteral: annotationLiterals) - { - List<Interceptor<?>> interceptors = getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, annotationLiteral); - for (Interceptor<?> interceptor: interceptors) - { - interceptorClasses.remove(interceptor.getBeanClass()); - } - } - - List<Interceptor<?>> interceptors = getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, - new AnnotationLiteral<Atomic>(){}, - new AnnotationLiteral<MissileBinding>(){}); - for (Interceptor<?> interceptor : interceptors) - { - interceptorClasses.remove(interceptor.getBeanClass()); - } - - assert interceptorClasses.size() == 1; - assert interceptorClasses.get(0).equals(NotEnabledAtomicInterceptor.class); + assert !getBeans(TransactionalInterceptor.class).isEmpty(); + assert !getBeans(SecureInterceptor.class).isEmpty(); } - @Test + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.3.12", id = "a") + @SpecAssertion(section = "11.3.12", id = "a") }) // WBRI-59 public void testResolveInterceptorsReturnsOrderedList() { - Annotation transactionalBinding = new AnnotationLiteral<Transactional>() - { - }; - Annotation secureBinding = new AnnotationLiteral<Secure>() - { - }; + Annotation transactionalBinding = new AnnotationLiteral<Transactional>() {}; + Annotation secureBinding = new AnnotationLiteral<Secure>() {}; List<Interceptor<?>> interceptors = getCurrentManager().resolveInterceptors( InterceptionType.AROUND_INVOKE, transactionalBinding, @@ -161,158 +129,126 @@ ); assert interceptors.size() == 2; assert interceptors.get(0).getInterceptorBindingTypes().size() == 1; - assert interceptors.get(0).getInterceptorBindingTypes().contains(secureBinding); + assert interceptors.get(0).getInterceptorBindingTypes().contains(transactionalBinding); assert interceptors.get(1).getInterceptorBindingTypes().size() == 1; - assert interceptors.get(1).getInterceptorBindingTypes().contains(transactionalBinding); + assert interceptors.get(1).getInterceptorBindingTypes().contains(secureBinding); } - - @Test(expectedExceptions = {IllegalArgumentException.class}) + + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.3.12", id = "b") + @SpecAssertion(section = "11.3.12", id = "b") }) // WBRI-59 public void testSameBindingTypesToResolveInterceptorsFails() { - Annotation transactionalBinding = new AnnotationLiteral<Transactional>() - { - }; + Annotation transactionalBinding = new AnnotationLiteral<Transactional>() {}; getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, transactionalBinding, transactionalBinding); } - - @Test(expectedExceptions = {IllegalArgumentException.class}) + + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.3.12", id = "c") + @SpecAssertion(section = "11.3.12", id = "c") }) // WBRI-59 public void testNoBindingTypesToResolveInterceptorsFails() { getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE); } - - @Test(expectedExceptions = {IllegalArgumentException.class}) + + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "11.3.12", id = "d") + @SpecAssertion(section = "11.3.12", id = "d") }) // WBRI-59 public void testNonBindingTypeToResolveInterceptorsFails() { - Annotation nonBinding = new AnnotationLiteral<NonBindingType>() - { - }; + Annotation nonBinding = new AnnotationLiteral<NonBindingType>() {}; getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, nonBinding); } - - @Test + + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "7.2", id = "a"), - @SpecAssertion(section = "9.2", id = "a"), - @SpecAssertion(section = "12.3", id = "kb") + @SpecAssertion(section = "7.2", id = "a"), + @SpecAssertion(section = "9.2", id = "a"), + @SpecAssertion(section = "12.3", id = "kb") }) public void testManagedBeanIsIntercepted() { MissileInterceptor.intercepted = false; - + Missile missile = getInstanceByType(Missile.class); missile.fire(); - + assert MissileInterceptor.intercepted; } - + @Test @SpecAssertion(section = "7.2", id = "a1") public void testInitializerMethodsNotIntercepted() { MissileInterceptor.intercepted = false; - - getInstanceByType(Missile.class); - + + Missile missile = getInstanceByType(Missile.class); + assert missile.initCalled; assert !MissileInterceptor.intercepted; } - - @Test + + @Test(groups = "ri-broken") @SpecAssertion(section = "7.2", id = "ia") public void testProducerMethodsAreIntercepted() { MissileInterceptor.intercepted = false; - + getInstanceByType(Wheat.class); - + assert MissileInterceptor.intercepted; } - - @Test + + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "9.1", id = "a"), - @SpecAssertion(section = "9.1", id = "b"), - @SpecAssertion(section = "9.1", id = "c"), - @SpecAssertion(section = "9.3", id = "a") + @SpecAssertion(section = "9.1", id = "a"), + @SpecAssertion(section = "9.1", id = "b"), + @SpecAssertion(section = "9.1", id = "c"), + @SpecAssertion(section = "9.3", id = "a") }) public void testInterceptorBindingAnnotation() - { - Interceptor<?> interceptorBean = getLoggedInterceptors().iterator().next(); + { + Interceptor<?> interceptorBean = (Interceptor<?>) getBeans(FileLogger.class).iterator().next(); assert interceptorBean.getInterceptorBindingTypes().size() == 1; - assert interceptorBean.getInterceptorBindingTypes().contains(new AnnotationLiteral<Logged>(){}); + assert interceptorBean.getInterceptorBindingTypes().contains(Logged.class); - Target target = (interceptorBean.getInterceptorBindingTypes().iterator().next()).annotationType().getAnnotation(Target.class); + Target target = ((AnnotatedElement) interceptorBean.getInterceptorBindingTypes().iterator().next()).getAnnotation(Target.class); List<ElementType> elements = Arrays.asList(target.value()); assert elements.contains(ElementType.TYPE); - assert elements.contains(ElementType.METHOD); + assert elements.contains(ElementType.METHOD); } - - @Test + + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "9.1.2", id = "a"), - @SpecAssertion(section = "9.1.2", id = "b"), - @SpecAssertion(section = "2.7.1.2", id = "b") + @SpecAssertion(section = "9.1.2", id = "a"), + @SpecAssertion(section = "9.1.2", id = "b"), + @SpecAssertion(section = "2.7.1.2", id = "b") }) public void testStereotypeInterceptorBindings() - { - FileLogger.intercepted = false; - NetworkLogger.intercepted = false; - - SecureTransaction secureTransaction = getInstanceByType(SecureTransaction.class); - secureTransaction.transact(); - - assert FileLogger.intercepted; - assert NetworkLogger.intercepted; + { + Bean<SecureTransaction> bean = getBeans(SecureTransaction.class).iterator().next(); + assert bean.getQualifiers().contains(Logged.class); } - - @Test + + @Test(groups = "ri-broken") @SpecAssertions({ - @SpecAssertion(section = "9.1.1", id = "a"), - @SpecAssertion(section = "9.1.1", id = "b") + @SpecAssertion(section = "9.1.1", id = "a"), + @SpecAssertion(section = "9.1.1", id = "b") }) public void testInterceptorBindingsCanDeclareOtherInterceptorBindings() { AtomicInterceptor.intercepted = false; MissileInterceptor.intercepted = false; - + AtomicFoo foo = getInstanceByType(AtomicFoo.class); foo.doAction(); - + assert AtomicInterceptor.intercepted; assert MissileInterceptor.intercepted; } - - private Interceptor<?> getTransactionalInterceptor() - { - return getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, new AnnotationLiteral<Transactional>() - { - }).iterator().next(); - } - - private List<Interceptor<?>> getLoggedInterceptors() - { - return getCurrentManager().resolveInterceptors(InterceptionType.AROUND_INVOKE, new AnnotationLiteral<Logged>() - { - }); - } - - private Set<Type> getInterfacesImplemented(Class<?> clazz) - { - Set<Type> interfaces = new HashSet<Type>(); - interfaces.addAll(new HierarchyDiscovery(clazz).getFlattenedTypes()); - return interfaces; - } - } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/Missile.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -5,8 +5,16 @@ @MissileBinding class Missile { + boolean initCalled = false; + @Inject - public void init() { } + public void init() { + initCalled = true; + } + public boolean initCalled() { + return initCalled; + } + public void fire() { } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -91,7 +91,7 @@ @SpecAssertion(section = "5.3", id = "la"), @SpecAssertion(section = "5.3.6", id = "a"), @SpecAssertion(section = "5.3.6", id = "d") }) - public void testAllBindingTypesSpecifiedForResolutionMustAppearOnBean() + public void testAllQualifiersSpecifiedForResolutionMustAppearOnBean() { assert getBeans(Animal.class, new ChunkyLiteral(), new AnnotationLiteral<Whitefish>() { @@ -209,38 +209,4 @@ assert getCurrentManager().getBeans("crabSpider").size() == 0; } - - @Test - @SpecAssertion(section = "TBD", id = "TBD") - public void testBeanTypesOnManagedBean() - { - assert getBeans(Canary.class).size() == 1; - Set<Bean<Bird>> beans = getBeans(Bird.class); - Bean<Canary> bean = getUniqueBean(Canary.class); - assert getBeans(Bird.class).isEmpty(); - assert bean.getTypes().size() == 1; - assert bean.getTypes().iterator().next().equals(Canary.class); - } - - @Test - @SpecAssertion(section = "TBD", id = "TBD") - public void testBeanTypesOnProducerMethod() - { - assert getBeans(Parrot.class).size() == 1; - assert getBeans(Bird.class).isEmpty(); - Bean<Parrot> bean = getUniqueBean(Parrot.class); - assert bean.getTypes().size() == 1; - assert bean.getTypes().iterator().next().equals(Parrot.class); - } - - @Test - @SpecAssertion(section = "TBD", id = "TBD") - public void testBeanTypesOnProducerField() - { - assert getBeans(Dove.class).size() == 1; - assert getBeans(Bird.class).isEmpty(); - Bean<Dove> bean = getUniqueBean(Dove.class); - assert bean.getTypes().size() == 1; - assert bean.getTypes().iterator().next().equals(Dove.class); - } } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -44,7 +44,7 @@ public void testAssignabilityToRawType() { Set<Bean<Dao>> beans = getBeans(Dao.class); - assert getBeans(Dao.class).size() == 3; // Dao, DaoProducer.getDao() and ObjectDao + assert getBeans(Dao.class).size() == 4; // Dao, DaoProducer.getDao(), DaoProducer.getRawDao and ObjectDao } @Test(groups= {"resolution"}) Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/DaoProducer.java 2009-10-16 02:59:08 UTC (rev 4131) @@ -31,4 +31,9 @@ return new Dao<Object, Object>(); } + @SuppressWarnings("unchecked") + @Produces Dao getRawDao() { + return getDao(); + } + } Modified: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/invocation/beans.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/invocation/beans.xml 2009-10-16 00:17:50 UTC (rev 4130) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/decorators/invocation/beans.xml 2009-10-16 02:59:08 UTC (rev 4131) @@ -3,5 +3,6 @@ <class>org.jboss.jsr299.tck.tests.decorators.invocation.TimestampLogger</class> <class>org.jboss.jsr299.tck.tests.decorators.invocation.FooDecorator1</class> <class>org.jboss.jsr299.tck.tests.decorators.invocation.FooDecorator2</class> + <class>org.jboss.jsr299.tck.tests.decorators.invocation.PigStyDecorator</class> </decorators> </beans>

15 years, 1 month

1
0
0 / 0

Weld SVN: r4130 - core/trunk/parent.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-15 20:17:50 -0400 (Thu, 15 Oct 2009) New Revision: 4130 Modified: core/trunk/parent/pom.xml Log: update to test harness snapshot again :-( Modified: core/trunk/parent/pom.xml =================================================================== --- core/trunk/parent/pom.xml 2009-10-16 00:17:34 UTC (rev 4129) +++ core/trunk/parent/pom.xml 2009-10-16 00:17:50 UTC (rev 4130) @@ -76,7 +76,7 @@ <log4j.version>1.2.14</log4j.version>  <testng.version>5.10</testng.version> - <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> + <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> <apache.httpclient.version>3.1</apache.httpclient.version> <junit.version>4.7</junit.version> <htmlunit.version>2.4</htmlunit.version>

15 years, 1 month

1
0
0 / 0

Weld SVN: r4129 - in cdi-tck/trunk: impl and 4 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-15 20:17:34 -0400 (Thu, 15 Oct 2009) New Revision: 4129 Modified: cdi-tck/trunk/impl/pom.xml cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java cdi-tck/trunk/pom.xml Log: CDITCK-37, CDITCK-34 Modified: cdi-tck/trunk/impl/pom.xml =================================================================== --- cdi-tck/trunk/impl/pom.xml 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/pom.xml 2009-10-16 00:17:34 UTC (rev 4129) @@ -81,11 +81,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> </dependency> Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-10-16 00:17:34 UTC (rev 4129) @@ -21,9 +21,9 @@ import javax.enterprise.inject.spi.BeanManager; import org.jboss.jsr299.tck.api.JSR299Configuration; -import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; import org.jboss.jsr299.tck.impl.OldSPIBridge; import org.jboss.testharness.api.DeploymentException; +import org.jboss.testharness.impl.ConfigurationFactory; public abstract class AbstractJSR299Test extends org.jboss.testharness.AbstractTest { @@ -64,7 +64,7 @@ @Override protected JSR299Configuration getCurrentConfiguration() { - return JSR299ConfigurationImpl.get(); + return ConfigurationFactory.get(JSR299Configuration.class); } /** Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/JSR299ConfigurationImpl.java 2009-10-16 00:17:34 UTC (rev 4129) @@ -12,11 +12,6 @@ public class JSR299ConfigurationImpl extends ConfigurationImpl implements JSR299Configuration { - public static JSR299Configuration get() - { - return ConfigurationImpl.get(JSR299Configuration.class); - } - public static final String INTEGRATION_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.integration"; public static final String UNIT_TEST_PACKAGE_NAME = "org.jboss.jsr299.tck.unit"; Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/conversation/client/ConversationTestPhaseListener.java 2009-10-16 00:17:34 UTC (rev 4129) @@ -9,41 +9,34 @@ import javax.faces.event.PhaseListener; import javax.servlet.http.HttpServletResponse; -import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; +import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.impl.OldSPIBridge; +import org.jboss.testharness.impl.ConfigurationFactory; public class ConversationTestPhaseListener implements PhaseListener { - + /** * */ - private static final long serialVersionUID = 1197355854770726526L; + private static final long serialVersionUID = 1197355854770726526L; -public static final String ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME = "org.jboss.jsr299.tck.activeBeforeApplyRequestValues"; + public static final String ACTIVE_BEFORE_APPLY_REQUEST_VALUES_HEADER_NAME = "org.jboss.jsr299.tck.activeBeforeApplyRequestValues"; private boolean activeBeforeApplyRequestValues; - + public void afterPhase(PhaseEvent event) { } public void beforePhase(PhaseEvent event) { - try - { - JSR299ConfigurationImpl.get(); - } - catch (NoClassDefFoundError e) - { - e.printStackTrace(); - e.getCause().printStackTrace(); - } + JSR299Configuration configuration = ConfigurationFactory.get(JSR299Configuration.class); if (event.getPhaseId().equals(PhaseId.APPLY_REQUEST_VALUES)) { try { - JSR299ConfigurationImpl.get().getManagers().getManager().getContext(ConversationScoped.class); + configuration.getManagers().getManager().getContext(ConversationScoped.class); activeBeforeApplyRequestValues = true; } catch (ContextNotActiveException e) @@ -53,7 +46,7 @@ } if (event.getPhaseId().equals(PhaseId.RENDER_RESPONSE)) { - BeanManager beanManager = JSR299ConfigurationImpl.get().getManagers().getManager(); + BeanManager beanManager = configuration.getManagers().getManager(); Conversation conversation = OldSPIBridge.getInstanceByType(beanManager, Conversation.class); HttpServletResponse response = (HttpServletResponse) event.getFacesContext().getExternalContext().getResponse(); response.addHeader(AbstractConversationTest.CID_HEADER_NAME, conversation.getId()); @@ -67,5 +60,5 @@ { return PhaseId.ANY_PHASE; } - + } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/Tarantula.java 2009-10-16 00:17:34 UTC (rev 4129) @@ -2,7 +2,9 @@ import javax.annotation.PreDestroy; +import org.jboss.jsr299.tck.api.JSR299Configuration; import org.jboss.jsr299.tck.impl.JSR299ConfigurationImpl; +import org.jboss.testharness.impl.ConfigurationFactory; class Tarantula extends Spider implements DeadlySpider { @@ -13,7 +15,7 @@ public Tarantula() { - dependentContextActive = JSR299ConfigurationImpl.get().getContexts().getDependentContext().isActive(); + dependentContextActive = ConfigurationFactory.get(JSR299Configuration.class).getContexts().getDependentContext().isActive(); } @PreDestroy Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-15 19:45:03 UTC (rev 4128) +++ cdi-tck/trunk/pom.xml 2009-10-16 00:17:34 UTC (rev 4129) @@ -75,8 +75,8 @@ <properties> <jboss.test.audit.version>1.0.0</jboss.test.audit.version> - <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> - <testng.version>5.9</testng.version> + <jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version> + <testng.version>5.10</testng.version> <jsr250.api.version>1.0</jsr250.api.version> <cdi.api.version>1.0-CR1</cdi.api.version> <atinject.api.version>1.0-PFD-1</atinject.api.version> @@ -93,7 +93,6 @@ <jsf.api.version>1.2_13</jsf.api.version> <jaxws.api.version>2.1</jaxws.api.version> <interceptor.api.version>3.1.0-CR1</interceptor.api.version> - <log4j.version>1.2.14</log4j.version> <jws.api.version>1.0-MR1</jws.api.version> <apache.httpclient.version>3.1</apache.httpclient.version> <htmlunit.version>2.4</htmlunit.version> @@ -174,12 +173,6 @@ </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - - <dependency> <groupId>javax.el</groupId> <artifactId>el-api</artifactId> <version>${uel.api.version}</version>

15 years, 1 month

1
0
0 / 0

Weld SVN: r4128 - in core/branches/1.0.0-CR1: bom and 1 other directory.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2009-10-15 15:45:03 -0400 (Thu, 15 Oct 2009) New Revision: 4128 Modified: core/branches/1.0.0-CR1/bom/pom.xml core/branches/1.0.0-CR1/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: core/branches/1.0.0-CR1/bom/pom.xml =================================================================== --- core/branches/1.0.0-CR1/bom/pom.xml 2009-10-15 19:44:57 UTC (rev 4127) +++ core/branches/1.0.0-CR1/bom/pom.xml 2009-10-15 19:45:03 UTC (rev 4128) @@ -155,9 +155,9 @@  <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1/bom</developerConnection> - <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1/core/bom</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/bom</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/core/bom</url> </scm> </project> Modified: core/branches/1.0.0-CR1/pom.xml =================================================================== --- core/branches/1.0.0-CR1/pom.xml 2009-10-15 19:44:57 UTC (rev 4127) +++ core/branches/1.0.0-CR1/pom.xml 2009-10-15 19:45:03 UTC (rev 4128) @@ -18,9 +18,9 @@  <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1</developerConnection> - <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</url> </scm> <profiles>

15 years, 1 month

1
0
0 / 0

Weld SVN: r4127 - core/tags.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2009-10-15 15:44:57 -0400 (Thu, 15 Oct 2009) New Revision: 4127 Added: core/tags/1.0.0-CR1-SP1/ Log: [maven-scm] copy for tag 1.0.0-CR1-SP1 Copied: core/tags/1.0.0-CR1-SP1 (from rev 4126, core/branches/1.0.0-CR1)

15 years, 1 month

1
0
0 / 0

Weld SVN: r4126 - in core/branches/1.0.0-CR1: bom and 8 other directories.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2009-10-15 15:44:45 -0400 (Thu, 15 Oct 2009) New Revision: 4126 Modified: core/branches/1.0.0-CR1/bom/pom.xml core/branches/1.0.0-CR1/impl/pom.xml core/branches/1.0.0-CR1/inject-tck-runner/pom.xml core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml core/branches/1.0.0-CR1/logging/pom.xml core/branches/1.0.0-CR1/osgi-bundle/pom.xml core/branches/1.0.0-CR1/parent/pom.xml core/branches/1.0.0-CR1/pom.xml core/branches/1.0.0-CR1/porting-package/pom.xml core/branches/1.0.0-CR1/tests/pom.xml Log: [maven-release-plugin] prepare release 1.0.0-CR1-SP1 Modified: core/branches/1.0.0-CR1/bom/pom.xml =================================================================== --- core/branches/1.0.0-CR1/bom/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/bom/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <parent> <groupId>org.jboss.weld</groupId> @@ -155,9 +155,9 @@  <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/bom</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/core/bom</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1/bom</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1/core/bom</url> </scm> </project> Modified: core/branches/1.0.0-CR1/impl/pom.xml =================================================================== --- core/branches/1.0.0-CR1/impl/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/impl/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.0.0-CR1/inject-tck-runner/pom.xml =================================================================== --- core/branches/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml =================================================================== --- core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.0.0-CR1/logging/pom.xml =================================================================== --- core/branches/1.0.0-CR1/logging/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/logging/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.0.0-CR1/osgi-bundle/pom.xml =================================================================== --- core/branches/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -16,7 +16,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.0.0-CR1/parent/pom.xml =================================================================== --- core/branches/1.0.0-CR1/parent/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/parent/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <relativePath>../bom</relativePath> </parent> Modified: core/branches/1.0.0-CR1/pom.xml =================================================================== --- core/branches/1.0.0-CR1/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <parent> <groupId>org.jboss.weld</groupId> @@ -18,9 +18,9 @@  <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1-SP1</url> </scm> <profiles> Modified: core/branches/1.0.0-CR1/porting-package/pom.xml =================================================================== --- core/branches/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/porting-package/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.0.0-CR1/tests/pom.xml =================================================================== --- core/branches/1.0.0-CR1/tests/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) +++ core/branches/1.0.0-CR1/tests/pom.xml 2009-10-15 19:44:45 UTC (rev 4126) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1-SP1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

15 years, 1 month

1
0
0 / 0

Weld SVN: r4125 - core/branches/1.0.0-CR1/osgi-bundle.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2009-10-15 14:55:50 -0400 (Thu, 15 Oct 2009) New Revision: 4125 Modified: core/branches/1.0.0-CR1/osgi-bundle/pom.xml Log: updates rom trunk Modified: core/branches/1.0.0-CR1/osgi-bundle/pom.xml =================================================================== --- core/branches/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) +++ core/branches/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:55:50 UTC (rev 4125) @@ -57,25 +57,42 @@ <_include>-osgi.bundle</_include> <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> - <_exportcontents>javax.decorator; - javax.enterprise.*; version=${osgi.version}, - org.jboss.weld.context; org.jboss.weld.ejb; - org.jboss.weld.bean; org.jboss.weld.bean.proxy; - org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; - org.jboss.weld.conversation; org.jboss.weld; + + <_exportcontents> + javax.inject; + javax.enterprise.*; + version=${osgi.version}, + org.jboss.weld.context; + org.jboss.weld.ejb; + org.jboss.weld.bean; + org.jboss.weld.bean.proxy; + org.jboss.weld.*.api.*; + org.jboss.weld.*.spi.*; + org.jboss.weld.conversation; + org.jboss.weld; org.jboss.weld.bootstrap; org.jboss.weld.introspector; - org.jboss.weld.servlet; version=${osgi.version}, - org.jboss.weld.el; version=${osgi.version}, - org.jboss.weld.jsf; include:="WeldPhaseListener"; + org.jboss.weld.servlet; version=${osgi.version}, + org.jboss.weld.el; + version=${osgi.version}, + org.jboss.weld.jsf; + include:="WeldPhaseListener"; + version=${osgi.version}, javassist.util.proxy;version="3.8.1.GA" - </_exportcontents> - <Import-Package>javax.annotation, javax.interceptor, - *;resolution:=optional</Import-Package> - <Private-Package>!javax.annotation.*, - !javax.interceptor.*</Private-Package> + </_exportcontents> + + <Import-Package> + javax.interceptor.*, *; + resolution:=optional + </Import-Package> + + <Private-Package> + !javax.interceptor.* + </Private-Package> + </instructions> +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> </project> -

15 years, 1 month

1
0
0 / 0

Weld SVN: r4124 - in core/tags/1.0.0-CR1: bom and 8 other directories.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2009-10-15 14:38:02 -0400 (Thu, 15 Oct 2009) New Revision: 4124 Modified: core/tags/1.0.0-CR1/bom/pom.xml core/tags/1.0.0-CR1/impl/pom.xml core/tags/1.0.0-CR1/inject-tck-runner/pom.xml core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml core/tags/1.0.0-CR1/logging/pom.xml core/tags/1.0.0-CR1/osgi-bundle/pom.xml core/tags/1.0.0-CR1/parent/pom.xml core/tags/1.0.0-CR1/pom.xml core/tags/1.0.0-CR1/porting-package/pom.xml core/tags/1.0.0-CR1/tests/pom.xml Log: [maven-release-plugin] prepare release 1.0.0-CR1 Modified: core/tags/1.0.0-CR1/bom/pom.xml =================================================================== --- core/tags/1.0.0-CR1/bom/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/bom/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <parent> <groupId>org.jboss.weld</groupId> @@ -155,9 +155,9 @@  <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/bom</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/core/bom</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/core/bom</url> </scm> </project> Modified: core/tags/1.0.0-CR1/impl/pom.xml =================================================================== --- core/tags/1.0.0-CR1/impl/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/impl/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/inject-tck-runner/pom.xml =================================================================== --- core/tags/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml =================================================================== --- core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/logging/pom.xml =================================================================== --- core/tags/1.0.0-CR1/logging/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/logging/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/osgi-bundle/pom.xml =================================================================== --- core/tags/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -16,7 +16,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/parent/pom.xml =================================================================== --- core/tags/1.0.0-CR1/parent/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/parent/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <relativePath>../bom</relativePath> </parent> Modified: core/tags/1.0.0-CR1/pom.xml =================================================================== --- core/tags/1.0.0-CR1/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <parent> <groupId>org.jboss.weld</groupId> @@ -18,9 +18,9 @@  <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0-CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</url> </scm> <profiles> Modified: core/tags/1.0.0-CR1/porting-package/pom.xml =================================================================== --- core/tags/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/tests/pom.xml =================================================================== --- core/tags/1.0.0-CR1/tests/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) +++ core/tags/1.0.0-CR1/tests/pom.xml 2009-10-15 18:38:02 UTC (rev 4124) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> + <version>1.0.0-CR1</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

15 years, 1 month

1
0
0 / 0

Weld SVN: r4123 - in core/branches: 1.0.0-CR1 and 9 other directories.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2009-10-15 14:37:51 -0400 (Thu, 15 Oct 2009) New Revision: 4123 Added: core/branches/1.0.0-CR1/ core/branches/1.0.0-CR1/bom/pom.xml core/branches/1.0.0-CR1/impl/pom.xml core/branches/1.0.0-CR1/inject-tck-runner/pom.xml core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml core/branches/1.0.0-CR1/logging/pom.xml core/branches/1.0.0-CR1/osgi-bundle/pom.xml core/branches/1.0.0-CR1/parent/pom.xml core/branches/1.0.0-CR1/pom.xml core/branches/1.0.0-CR1/porting-package/pom.xml core/branches/1.0.0-CR1/tests/pom.xml Removed: core/branches/1.0.0-CR1/bom/pom.xml core/branches/1.0.0-CR1/impl/pom.xml core/branches/1.0.0-CR1/inject-tck-runner/pom.xml core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml core/branches/1.0.0-CR1/logging/pom.xml core/branches/1.0.0-CR1/osgi-bundle/pom.xml core/branches/1.0.0-CR1/parent/pom.xml core/branches/1.0.0-CR1/pom.xml core/branches/1.0.0-CR1/porting-package/pom.xml core/branches/1.0.0-CR1/tests/pom.xml Log: [maven-release-plugin] copy for branch 1.0.0-CR1 Copied: core/branches/1.0.0-CR1 (from rev 4120, core/tags/1.0.0-CR1) Deleted: core/branches/1.0.0-CR1/bom/pom.xml =================================================================== --- core/tags/1.0.0-CR1/bom/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/bom/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,163 +0,0 @@ -<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.weld</groupId> - <artifactId>weld-core-bom</artifactId> - <packaging>pom</packaging> - <version>1.0.0-CR1-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>2</version> - </parent> - - <name>Weld Core BOM</name> - <url>http://www.seamframework.org/Weld</url> - -  - <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <distribution>repo</distribution> - <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> - </license> - </licenses> - - <developers> - <developer> - <name>Weld committers</name> - </developer> - </developers> - -  - <repositories> - <repository> - <id>repository.jboss.org</id> - <name>JBoss Release Repository</name> - <url>http://repository.jboss.org/maven2</url> - <releases> - <enabled>true</enabled> - </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> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - </repository> - </repositories> - - <properties> - <weld.api.version>1.0-CR1</weld.api.version> - <google.collections.version>1.0-rc2</google.collections.version> - <javassist.version>3.11.0.GA</javassist.version> - <cdi.tck.version>1.0.0-Beta4</cdi.tck.version> - <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version> - <jboss.interceptor.version>1.0.0-CR1</jboss.interceptor.version> - </properties> - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api-bom</artifactId> - <version>${weld.api.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>${javassist.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-api</artifactId> - <version>${cdi.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <version>${cdi.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.atinject</groupId> - <artifactId>inject-tck</artifactId> - <version>${atinject.tck.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - <version>${jboss.interceptor.version}</version> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>${google.collections.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - -  - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/bom</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/core/bom</url> - </scm> - -</project> Copied: core/branches/1.0.0-CR1/bom/pom.xml (from rev 4122, core/tags/1.0.0-CR1/bom/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/bom/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/bom/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,163 @@ +<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.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <packaging>pom</packaging> + <version>1.0.0-CR1-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>2</version> + </parent> + + <name>Weld Core BOM</name> + <url>http://www.seamframework.org/Weld</url> + +  + <description>Weld Core "bill of materials" which can be imported by any project using the Weld implementation of CDI. It provides dependency management for the implementation.</description> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <distribution>repo</distribution> + <url>http://www.apache.org/licenses/LICENSE-2.0.html</url> + </license> + </licenses> + + <developers> + <developer> + <name>Weld committers</name> + </developer> + </developers> + +  + <repositories> + <repository> + <id>repository.jboss.org</id> + <name>JBoss Release Repository</name> + <url>http://repository.jboss.org/maven2</url> + <releases> + <enabled>true</enabled> + </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> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + <repository> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + </repository> + </repositories> + + <properties> + <weld.api.version>1.0-CR1</weld.api.version> + <google.collections.version>1.0-rc2</google.collections.version> + <javassist.version>3.11.0.GA</javassist.version> + <cdi.tck.version>1.0.0-Beta4</cdi.tck.version> + <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version> + <jboss.interceptor.version>1.0.0-CR1</jboss.interceptor.version> + </properties> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api-bom</artifactId> + <version>${weld.api.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>${javassist.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-api</artifactId> + <version>${cdi.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <version>${cdi.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.atinject</groupId> + <artifactId>inject-tck</artifactId> + <version>${atinject.tck.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + <version>${jboss.interceptor.version}</version> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>${google.collections.version}</version> + </dependency> + + </dependencies> + </dependencyManagement> + +  + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/bom</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/core/bom</url> + </scm> + +</project> Deleted: core/branches/1.0.0-CR1/impl/pom.xml =================================================================== --- core/tags/1.0.0-CR1/impl/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/impl/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,130 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <name>Weld Core Implementation</name> - <description>Weld's implementation of CDI</description> - <dependencies> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.annotation</groupId> - <artifactId>jsr250-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <optional>true</optional> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> -  - - </dependency> - - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> -  - - </dependency> - - </dependencies> - - <profiles> - <profile> - <id>javax.xml.ws</id> - <activation> - <jdk>1.5</jdk> - </activation> - <dependencies> - <dependency> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - </dependency> - </dependencies> - </profile> - </profiles> -</project> Copied: core/branches/1.0.0-CR1/impl/pom.xml (from rev 4122, core/tags/1.0.0-CR1/impl/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/impl/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/impl/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,130 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <name>Weld Core Implementation</name> + <description>Weld's implementation of CDI</description> + <dependencies> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> +  + + </dependency> + + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> +  + + </dependency> + + </dependencies> + + <profiles> + <profile> + <id>javax.xml.ws</id> + <activation> + <jdk>1.5</jdk> + </activation> + <dependencies> + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + </dependency> + </dependencies> + </profile> + </profiles> +</project> Deleted: core/branches/1.0.0-CR1/inject-tck-runner/pom.xml =================================================================== --- core/tags/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,58 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-inject-tck-runner</artifactId> - <name>AtInject TCK runner for Weld</name> - <description>Aggregates dependencies and run's the AtInject TCK for Weld</description> - - <dependencies> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.atinject</groupId> - <artifactId>inject-tck</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/AtInjectTCK.java</include> - </includes> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: core/branches/1.0.0-CR1/inject-tck-runner/pom.xml (from rev 4122, core/tags/1.0.0-CR1/inject-tck-runner/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/inject-tck-runner/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,58 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-inject-tck-runner</artifactId> + <name>AtInject TCK runner for Weld</name> + <description>Aggregates dependencies and run's the AtInject TCK for Weld</description> + + <dependencies> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.atinject</groupId> + <artifactId>inject-tck</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/AtInjectTCK.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> + +</project> Deleted: core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml =================================================================== --- core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,290 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-jboss-tck-runner</artifactId> - <name>CDI TCK runner for Weld</name> - <description>Aggregates dependencies and run's the CDI TCK (both standalone and on JBoss AS)</description> - - <dependencies> - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - </dependency> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-52</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - <type>xml</type> - <classifier>suite</classifier> - <overWrite>true</overWrite> - </artifactItem> - <artifactItem> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> - </suiteXmlFiles> - <argLine>-Xmx256m</argLine> - <forkMode>once</forkMode> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/assembly.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>run</id> - <activation> - <property> - <name>!osgi.bundles.defaultStartLevel</name> - </property> - </activation> - <dependencies> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-impl</artifactId> - </dependency> - - </dependencies> - </profile> - <profile> - <id>incontainer-debug</id> - <activation> - <property> - <name>incontainer-debug</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>incontainer</id> - <activation> - <property> - <name>incontainer</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.outputDirectory</name> - <value>target</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>write-artifacts-to-disk</id> - <activation> - <property> - <name>dumpArtifacts</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jsr-299-artifacts</id> - <phase>generate-test-sources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.jboss.testharness.api.TCK</mainClass> - <systemProperties> - <systemProperty> - <key>dumpArtifacts</key> - <value>true</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.outputDirectory</key> - <value>target/jsr299-artifacts</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.libraryDirectory</key> - <value>target/dependency/lib</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Copied: core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml (from rev 4122, core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,290 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-jboss-tck-runner</artifactId> + <name>CDI TCK runner for Weld</name> + <description>Aggregates dependencies and run's the CDI TCK (both standalone and on JBoss AS)</description> + + <dependencies> + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-52</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + <type>xml</type> + <classifier>suite</classifier> + <overWrite>true</overWrite> + </artifactItem> + <artifactItem> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + </suiteXmlFiles> + <argLine>-Xmx256m</argLine> + <forkMode>once</forkMode> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/assembly.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <id>make-assembly</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>run</id> + <activation> + <property> + <name>!osgi.bundles.defaultStartLevel</name> + </property> + </activation> + <dependencies> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-impl</artifactId> + </dependency> + + </dependencies> + </profile> + <profile> + <id>incontainer-debug</id> + <activation> + <property> + <name>incontainer-debug</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jsr-299-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/jsr299-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> + +</project> Deleted: core/branches/1.0.0-CR1/logging/pom.xml =================================================================== --- core/tags/1.0.0-CR1/logging/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/logging/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,34 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - <name>Weld Logging</name> - <description>Weld logging module (to be replaced with slf4j)</description> - <dependencies> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <scope>test</scope> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <optional>true</optional> - </dependency> - - </dependencies> -</project> Copied: core/branches/1.0.0-CR1/logging/pom.xml (from rev 4122, core/tags/1.0.0-CR1/logging/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/logging/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/logging/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,34 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + <name>Weld Logging</name> + <description>Weld logging module (to be replaced with slf4j)</description> + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <scope>test</scope> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <optional>true</optional> + </dependency> + + </dependencies> +</project> Deleted: core/branches/1.0.0-CR1/osgi-bundle/pom.xml =================================================================== --- core/tags/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,146 +0,0 @@ - -  -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.jboss.weld</groupId> - <artifactId>weld-osgi-bundle</artifactId> - <name>Weld OSGi Bundle</name> - <description>Weld runtime packaged as an OSGi bundle</description> - - <developers> - <developer> - <id>ss141213</id> - <name>Sanjeeb Sahoo</name> - <url>http://weblogs.dev.java.net/ss141213</url> - <organization>Sun Microsystems, Inc.</organization> - <roles> - <role>developer</role> - </roles> - </developer> - <developer> - <name>Roger Kitain</name> - <id>rogerk</id> - <organization>Sun Microsystems, Inc.</organization> - </developer> - </developers> - - <properties> - <osgi.version>1.0</osgi.version> - </properties> - <build> - <plugins> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <_include>-osgi.bundle</_include> - - <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> - <_exportcontents>javax.decorator; - javax.enterprise.*; version=${osgi.version}, - org.jboss.weld.context; org.jboss.weld.ejb; - org.jboss.weld.bean; org.jboss.weld.bean.proxy; - org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; - org.jboss.weld.conversation; org.jboss.weld; - org.jboss.weld.bootstrap; - org.jboss.weld.introspector; - org.jboss.weld.servlet; version=${osgi.version}, - org.jboss.weld.el; version=${osgi.version}, - org.jboss.weld.jsf; include:="WeldPhaseListener"; - version=${osgi.version}, - javassist.util.proxy;version="3.8.1.GA" - </_exportcontents> - <Import-Package>javax.annotation, javax.interceptor, - *;resolution:=optional</Import-Package> - <Private-Package>!javax.annotation.*, - !javax.interceptor.*</Private-Package> - </instructions> -  - <unpackBundle>true</unpackBundle> - </configuration> - <executions> - <execution> - <id>osgi-bundle</id> - <goals> - <goal>bundle</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - </dependency> - - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - - <dependency> - <groupId>javax.inject</groupId> - <artifactId>javax.inject</artifactId> - </dependency> - - </dependencies> - -</project> - Copied: core/branches/1.0.0-CR1/osgi-bundle/pom.xml (from rev 4122, core/tags/1.0.0-CR1/osgi-bundle/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/osgi-bundle/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,146 @@ + +  +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.jboss.weld</groupId> + <artifactId>weld-osgi-bundle</artifactId> + <name>Weld OSGi Bundle</name> + <description>Weld runtime packaged as an OSGi bundle</description> + + <developers> + <developer> + <id>ss141213</id> + <name>Sanjeeb Sahoo</name> + <url>http://weblogs.dev.java.net/ss141213</url> + <organization>Sun Microsystems, Inc.</organization> + <roles> + <role>developer</role> + </roles> + </developer> + <developer> + <name>Roger Kitain</name> + <id>rogerk</id> + <organization>Sun Microsystems, Inc.</organization> + </developer> + </developers> + + <properties> + <osgi.version>1.0</osgi.version> + </properties> + <build> + <plugins> + + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <_include>-osgi.bundle</_include> + + <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> + <_exportcontents>javax.decorator; + javax.enterprise.*; version=${osgi.version}, + org.jboss.weld.context; org.jboss.weld.ejb; + org.jboss.weld.bean; org.jboss.weld.bean.proxy; + org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; + org.jboss.weld.conversation; org.jboss.weld; + org.jboss.weld.bootstrap; + org.jboss.weld.introspector; + org.jboss.weld.servlet; version=${osgi.version}, + org.jboss.weld.el; version=${osgi.version}, + org.jboss.weld.jsf; include:="WeldPhaseListener"; + version=${osgi.version}, + javassist.util.proxy;version="3.8.1.GA" + </_exportcontents> + <Import-Package>javax.annotation, javax.interceptor, + *;resolution:=optional</Import-Package> + <Private-Package>!javax.annotation.*, + !javax.interceptor.*</Private-Package> + </instructions> +  + <unpackBundle>true</unpackBundle> + </configuration> + <executions> + <execution> + <id>osgi-bundle</id> + <goals> + <goal>bundle</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> + + </dependencies> + +</project> + Deleted: core/branches/1.0.0-CR1/parent/pom.xml =================================================================== --- core/tags/1.0.0-CR1/parent/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/parent/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,167 +0,0 @@ -<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.weld</groupId> - <artifactId>weld-core-parent</artifactId> - <packaging>pom</packaging> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-bom</artifactId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../bom</relativePath> - </parent> - - <name>Weld Core Parent</name> - -  - - <url>http://www.seamframework.org/Weld</url> - - <description> - Parent for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE - </description> - - <ciManagement> - <system>Hudson</system> - <url>http://hudson.jboss.org</url> - </ciManagement> - - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WELD</url> - </issueManagement> - - <organization> - <name>Seam Framework</name> - <url>http://seamframework.org</url> - </organization> - - <inceptionYear>2008</inceptionYear> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - </license> - </licenses> - - <developers> - <developer> - <name>Pete Muir</name> - <roles> - <role>Project Lead</role> - </roles> - <email>pete.muir(a)jboss.org</email> - <organization>JBoss, a division of Red Hat</organization> - <url>http://in.relation.to/Bloggers/Pete</url> - </developer> - - <developer> - <name>Shane Bryzak</name> - <organization>JBoss, a division of Red Hat</organization> - </developer> - - <developer> - <name>David Allen</name> - </developer> - - <developer> - <name>Nicklas Karlsson</name> - </developer> - </developers> - - - <properties> - <glassfish.el.version>2.1.2-b04</glassfish.el.version> - <log4j.version>1.2.14</log4j.version> -  - <testng.version>5.9</testng.version> - <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> - <apache.httpclient.version>3.1</apache.httpclient.version> - <junit.version>4.7</junit.version> - <htmlunit.version>2.4</htmlunit.version> - </properties> - - -  - - <dependencyManagement> - <dependencies> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>${testng.version}</version> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-50</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-52</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-embedded</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-tomcat</artifactId> - <version>${jboss.test.harness.version}</version> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>${apache.httpclient.version}</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - </dependency> - - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>${htmlunit.version}</version> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <version>${glassfish.el.version}</version> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j.version}</version> - </dependency> - - </dependencies> - </dependencyManagement> - -</project> Copied: core/branches/1.0.0-CR1/parent/pom.xml (from rev 4122, core/tags/1.0.0-CR1/parent/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/parent/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/parent/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,167 @@ +<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.weld</groupId> + <artifactId>weld-core-parent</artifactId> + <packaging>pom</packaging> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-bom</artifactId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../bom</relativePath> + </parent> + + <name>Weld Core Parent</name> + +  + + <url>http://www.seamframework.org/Weld</url> + + <description> + Parent for Weld, the reference implementation of JSR 299: Contexts and Dependency Injection for Java EE + </description> + + <ciManagement> + <system>Hudson</system> + <url>http://hudson.jboss.org</url> + </ciManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/browse/WELD</url> + </issueManagement> + + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + + <inceptionYear>2008</inceptionYear> + + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + </license> + </licenses> + + <developers> + <developer> + <name>Pete Muir</name> + <roles> + <role>Project Lead</role> + </roles> + <email>pete.muir(a)jboss.org</email> + <organization>JBoss, a division of Red Hat</organization> + <url>http://in.relation.to/Bloggers/Pete</url> + </developer> + + <developer> + <name>Shane Bryzak</name> + <organization>JBoss, a division of Red Hat</organization> + </developer> + + <developer> + <name>David Allen</name> + </developer> + + <developer> + <name>Nicklas Karlsson</name> + </developer> + </developers> + + + <properties> + <glassfish.el.version>2.1.2-b04</glassfish.el.version> + <log4j.version>1.2.14</log4j.version> +  + <testng.version>5.9</testng.version> + <jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version> + <apache.httpclient.version>3.1</apache.httpclient.version> + <junit.version>4.7</junit.version> + <htmlunit.version>2.4</htmlunit.version> + </properties> + + +  + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${testng.version}</version> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-50</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-52</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-embedded</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-tomcat</artifactId> + <version>${jboss.test.harness.version}</version> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>${apache.httpclient.version}</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + </dependency> + + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <version>${htmlunit.version}</version> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <version>${glassfish.el.version}</version> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4j.version}</version> + </dependency> + + </dependencies> + </dependencyManagement> + +</project> Deleted: core/branches/1.0.0-CR1/pom.xml =================================================================== --- core/tags/1.0.0-CR1/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,78 +0,0 @@ -<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.weld</groupId> - <artifactId>weld-core-build-aggregator</artifactId> - <packaging>pom</packaging> - <version>1.0.0-CR1-SNAPSHOT</version> - - <parent> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-parent</artifactId> - <version>2</version> - </parent> - - <name>Weld Build Aggregator</name> - -  - <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description> - -  - <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</url> - </scm> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>bom</module> - <module>parent</module> - <module>logging</module> - <module>impl</module> - <module>tests</module> - <module>porting-package</module> - <module>inject-tck-runner</module> - <module>jboss-tck-runner</module> - <module>osgi-bundle</module> - </modules> - </profile> - <profile> - <id>skip-tests</id> - <modules> - <module>bom</module> - <module>parent</module> - <module>logging</module> - <module>impl</module> - <module>osgi-bundle</module> - </modules> - </profile> - </profiles> - -  - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase> -  - <preparationGoals>install</preparationGoals> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - -</project> Copied: core/branches/1.0.0-CR1/pom.xml (from rev 4122, core/tags/1.0.0-CR1/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,78 @@ +<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.weld</groupId> + <artifactId>weld-core-build-aggregator</artifactId> + <packaging>pom</packaging> + <version>1.0.0-CR1-SNAPSHOT</version> + + <parent> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-parent</artifactId> + <version>2</version> + </parent> + + <name>Weld Build Aggregator</name> + +  + <description>The build aggregator for Weld, which takes care of calling the modules which make up Weld</description> + +  + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</url> + </scm> + + <profiles> + <profile> + <id>default</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <modules> + <module>bom</module> + <module>parent</module> + <module>logging</module> + <module>impl</module> + <module>tests</module> + <module>porting-package</module> + <module>inject-tck-runner</module> + <module>jboss-tck-runner</module> + <module>osgi-bundle</module> + </modules> + </profile> + <profile> + <id>skip-tests</id> + <modules> + <module>bom</module> + <module>parent</module> + <module>logging</module> + <module>impl</module> + <module>osgi-bundle</module> + </modules> + </profile> + </profiles> + +  + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <tagBase>https://svn.jboss.org/repos/weld/core/tags</tagBase> +  + <preparationGoals>install</preparationGoals> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + +</project> Deleted: core/branches/1.0.0-CR1/porting-package/pom.xml =================================================================== --- core/tags/1.0.0-CR1/porting-package/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,46 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> - <name>Weld Porting Package for the CDI TCK</name> - <dependencies> - - <dependency> - <groupId>javax.enterprise</groupId> - <artifactId>cdi-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.jsr299.tck</groupId> - <artifactId>jsr299-tck-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - </dependency> - - </dependencies> - -</project> Copied: core/branches/1.0.0-CR1/porting-package/pom.xml (from rev 4122, core/tags/1.0.0-CR1/porting-package/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/porting-package/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,46 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> + <name>Weld Porting Package for the CDI TCK</name> + <dependencies> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.jsr299.tck</groupId> + <artifactId>jsr299-tck-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + </dependency> + + </dependencies> + +</project> Deleted: core/branches/1.0.0-CR1/tests/pom.xml =================================================================== --- core/tags/1.0.0-CR1/tests/pom.xml 2009-10-15 16:39:25 UTC (rev 4120) +++ core/branches/1.0.0-CR1/tests/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -1,265 +0,0 @@ -<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"> - <parent> - <artifactId>weld-core-parent</artifactId> - <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core-test</artifactId> - <name>Weld Core Tests</name> - <description>Tests for Weld, not including the CDI and AtInject TCKs</description> - <dependencies> - - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <exclusions> - <exclusion> - <artifactId>junit</artifactId> - <groupId>junit</groupId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness-jboss-as-52</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </dependency> - - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor-api</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.interceptor</groupId> - <artifactId>jboss-interceptor</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.ejb3</groupId> - <artifactId>jboss-ejb3-api</artifactId> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </dependency> - - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - </dependency> - - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - </dependency> - - </dependencies> - - <build> - <defaultGoal>test</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>unit-tests.xml</suiteXmlFile> - </suiteXmlFiles> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <executions> - <execution> - <id>generate-test-report</id> - <phase>test</phase> - <goals> - <goal>report-only</goal> - </goals> - </execution> - </executions> - <configuration> - <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> - <outputName>test-report</outputName> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>incontainer</id> - <activation> - <property> - <name>incontainer</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <stripVersion>true</stripVersion> - <artifactItems> - <artifactItem> - <groupId>org.jboss.test-harness</groupId> - <artifactId>jboss-test-harness</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> - </artifactItem> - <artifactItem> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <suiteXmlFiles> - <suiteXmlFile>unit-tests.xml</suiteXmlFile> - </suiteXmlFiles> - <systemProperties> - <property> - <name>org.jboss.testharness.standalone</name> - <value>false</value> - </property> - <property> - <name>org.jboss.testharness.container.extraConfigurationDir</name> - <value>../jboss-as</value> - </property> - <property> - <name>org.jboss.testharness.container.forceRestart</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.runIntegrationTests</name> - <value>true</value> - </property> - <property> - <name>org.jboss.testharness.libraryDirectory</name> - <value>target/dependency/lib</value> - </property> - <property> - <name>org.jboss.testharness.outputDirectory</name> - <value>target</value> - </property> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>write-artifacts-to-disk</id> - <activation> - <property> - <name>dumpArtifacts</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-test-artifacts</id> - <phase>generate-test-sources</phase> - <goals> - <goal>java</goal> - </goals> - </execution> - </executions> - <configuration> - <mainClass>org.jboss.testharness.api.TCK</mainClass> - <classpathScope>test</classpathScope> - <systemProperties> - <systemProperty> - <key>dumpArtifacts</key> - <value>true</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.outputDirectory</key> - <value>target/test-artifacts</value> - </systemProperty> - <systemProperty> - <key>org.jboss.testharness.libraryDirectory</key> - <value>target/dependency/lib</value> - </systemProperty> - </systemProperties> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> Copied: core/branches/1.0.0-CR1/tests/pom.xml (from rev 4122, core/tags/1.0.0-CR1/tests/pom.xml) =================================================================== --- core/branches/1.0.0-CR1/tests/pom.xml (rev 0) +++ core/branches/1.0.0-CR1/tests/pom.xml 2009-10-15 18:37:51 UTC (rev 4123) @@ -0,0 +1,265 @@ +<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"> + <parent> + <artifactId>weld-core-parent</artifactId> + <groupId>org.jboss.weld</groupId> + <version>1.0.0-CR1-SNAPSHOT</version> + <relativePath>../parent/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core-test</artifactId> + <name>Weld Core Tests</name> + <description>Tests for Weld, not including the CDI and AtInject TCKs</description> + <dependencies> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + <exclusions> + <exclusion> + <artifactId>junit</artifactId> + <groupId>junit</groupId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness-jboss-as-52</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.ejb3</groupId> + <artifactId>jboss-ejb3-api</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </dependency> + + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + </dependency> + + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + + <dependency> + <groupId>net.sourceforge.htmlunit</groupId> + <artifactId>htmlunit</artifactId> + </dependency> + + </dependencies> + + <build> + <defaultGoal>test</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + <executions> + <execution> + <id>generate-test-report</id> + <phase>test</phase> + <goals> + <goal>report-only</goal> + </goals> + </execution> + </executions> + <configuration> + <outputDirectory>${project.build.directory}/surefire-reports</outputDirectory> + <outputName>test-report</outputName> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>incontainer</id> + <activation> + <property> + <name>incontainer</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <stripVersion>true</stripVersion> + <artifactItems> + <artifactItem> + <groupId>org.jboss.test-harness</groupId> + <artifactId>jboss-test-harness</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/classes/lib</outputDirectory> + </artifactItem> + <artifactItem> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/dependency/lib</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <suiteXmlFiles> + <suiteXmlFile>unit-tests.xml</suiteXmlFile> + </suiteXmlFiles> + <systemProperties> + <property> + <name>org.jboss.testharness.standalone</name> + <value>false</value> + </property> + <property> + <name>org.jboss.testharness.container.extraConfigurationDir</name> + <value>../jboss-as</value> + </property> + <property> + <name>org.jboss.testharness.container.forceRestart</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.runIntegrationTests</name> + <value>true</value> + </property> + <property> + <name>org.jboss.testharness.libraryDirectory</name> + <value>target/dependency/lib</value> + </property> + <property> + <name>org.jboss.testharness.outputDirectory</name> + <value>target</value> + </property> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>write-artifacts-to-disk</id> + <activation> + <property> + <name>dumpArtifacts</name> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-test-artifacts</id> + <phase>generate-test-sources</phase> + <goals> + <goal>java</goal> + </goals> + </execution> + </executions> + <configuration> + <mainClass>org.jboss.testharness.api.TCK</mainClass> + <classpathScope>test</classpathScope> + <systemProperties> + <systemProperty> + <key>dumpArtifacts</key> + <value>true</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.outputDirectory</key> + <value>target/test-artifacts</value> + </systemProperty> + <systemProperty> + <key>org.jboss.testharness.libraryDirectory</key> + <value>target/dependency/lib</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project>

15 years, 1 month

1
0
0 / 0

Weld SVN: r4122 - in core/tags/1.0.0-CR1: bom and 8 other directories.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2009-10-15 14:37:23 -0400 (Thu, 15 Oct 2009) New Revision: 4122 Modified: core/tags/1.0.0-CR1/bom/pom.xml core/tags/1.0.0-CR1/impl/pom.xml core/tags/1.0.0-CR1/inject-tck-runner/pom.xml core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml core/tags/1.0.0-CR1/logging/pom.xml core/tags/1.0.0-CR1/osgi-bundle/pom.xml core/tags/1.0.0-CR1/parent/pom.xml core/tags/1.0.0-CR1/pom.xml core/tags/1.0.0-CR1/porting-package/pom.xml core/tags/1.0.0-CR1/tests/pom.xml Log: [maven-release-plugin] prepare branch 1.0.0-CR1 Modified: core/tags/1.0.0-CR1/bom/pom.xml =================================================================== --- core/tags/1.0.0-CR1/bom/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/bom/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> @@ -155,9 +155,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</developerConnection> - <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/core/bom</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1/bom</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1/core/bom</url> </scm> </project> Modified: core/tags/1.0.0-CR1/impl/pom.xml =================================================================== --- core/tags/1.0.0-CR1/impl/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/impl/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/inject-tck-runner/pom.xml =================================================================== --- core/tags/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/inject-tck-runner/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml =================================================================== --- core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/jboss-tck-runner/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/logging/pom.xml =================================================================== --- core/tags/1.0.0-CR1/logging/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/logging/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/osgi-bundle/pom.xml =================================================================== --- core/tags/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/osgi-bundle/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -16,7 +16,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/parent/pom.xml =================================================================== --- core/tags/1.0.0-CR1/parent/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/parent/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <relativePath>../bom</relativePath> </parent> Modified: core/tags/1.0.0-CR1/pom.xml =================================================================== --- core/tags/1.0.0-CR1/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> @@ -18,9 +18,9 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/core/tags/1.0.0-CR1</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</developerConnection> - <url>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.0-CR1</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.0-CR1</url> </scm> <profiles> Modified: core/tags/1.0.0-CR1/porting-package/pom.xml =================================================================== --- core/tags/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/porting-package/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/tags/1.0.0-CR1/tests/pom.xml =================================================================== --- core/tags/1.0.0-CR1/tests/pom.xml 2009-10-15 18:35:50 UTC (rev 4121) +++ core/tags/1.0.0-CR1/tests/pom.xml 2009-10-15 18:37:23 UTC (rev 4122) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.0-CR1</version> + <version>1.0.0-CR1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

15 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits October 2009