Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFoo.java Mon Jun 4 23:26:08 2018 @@ -19,8 +19,9 @@ import javax.inject.Provider; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooFoo { @Inject - public CtorFooFoo(@Reference Provider<Foo> foo_a, @Reference Provider<Foo> foo_b) {} + public CtorFooFoo(@Reluctant @Reference Provider<Foo> foo_a, @Reluctant @Reference Provider<Foo> foo_b) {} } \ No newline at end of file
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFooNamed.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFooNamed.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooFooNamed.java Mon Jun 4 23:26:08 2018 @@ -20,10 +20,11 @@ import javax.inject.Provider; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooFooNamed { @Inject public CtorFooFooNamed( - @Reference @Named("foo_a") Provider<Foo> foo_a, - @Reference @Named("foo_b") Provider<Foo> foo_b) {} + @Reluctant @Reference @Named("foo_a") Provider<Foo> foo_a, + @Reluctant @Reference @Named("foo_b") Provider<Foo> foo_b) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooNamed.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooNamed.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooNamed.java Mon Jun 4 23:26:08 2018 @@ -20,8 +20,9 @@ import javax.inject.Provider; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooNamed { @Inject - public CtorFooNamed(@Reference @Named("_foo_") Provider<Foo> foo) {} + public CtorFooNamed(@Reluctant @Reference @Named("_foo_") Provider<Foo> foo) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooOptional.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooOptional.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooOptional.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorFooOptional.java Mon Jun 4 23:26:08 2018 @@ -21,8 +21,9 @@ import javax.inject.Provider; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooOptional { @Inject - public CtorFooOptional(@Reference Provider<Optional<Foo>> foo) {} + public CtorFooOptional(@Reluctant @Reference Provider<Optional<Foo>> foo) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorListFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorListFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorListFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctordynamicreluctant/CtorListFoo.java Mon Jun 4 23:26:08 2018 @@ -21,8 +21,9 @@ import javax.inject.Provider; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorListFoo { @Inject - public CtorListFoo(@Reference Provider<List<Foo>> foos) {} + public CtorListFoo(@Reluctant @Reference Provider<List<Foo>> foos) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorCollectionFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorCollectionFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorCollectionFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorCollectionFoo.java Mon Jun 4 23:26:08 2018 @@ -19,10 +19,9 @@ import java.util.Collection; import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; -import org.osgi.service.cdi.annotations.Greedy; import org.osgi.service.cdi.annotations.Reference; public class CtorCollectionFoo { @Inject - public CtorCollectionFoo(@Greedy @Reference Collection<Foo> foos) {} + public CtorCollectionFoo(@Reference Collection<Foo> foos) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFoo.java Mon Jun 4 23:26:08 2018 @@ -17,10 +17,9 @@ package org.apache.aries.cdi.container.t import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; -import org.osgi.service.cdi.annotations.Greedy; import org.osgi.service.cdi.annotations.Reference; public class CtorFoo { @Inject - public CtorFoo(@Greedy @Reference Foo foo) {} + public CtorFoo(@Reference Foo foo) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooBar.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooBar.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooBar.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooBar.java Mon Jun 4 23:26:08 2018 @@ -18,10 +18,9 @@ import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Bar; import org.apache.aries.cdi.container.test.beans.Foo; -import org.osgi.service.cdi.annotations.Greedy; import org.osgi.service.cdi.annotations.Reference; public class CtorFooBar { @Inject - public CtorFooBar(@Greedy @Reference Foo foo, @Greedy @Reference Bar bar) {} + public CtorFooBar(@Reference Foo foo, @Reference Bar bar) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFoo.java Mon Jun 4 23:26:08 2018 @@ -17,10 +17,9 @@ package org.apache.aries.cdi.container.t import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; -import org.osgi.service.cdi.annotations.Greedy; import org.osgi.service.cdi.annotations.Reference; public class CtorFooFoo { @Inject - public CtorFooFoo(@Greedy @Reference Foo foo_a, @Greedy @Reference Foo foo_b) {} + public CtorFooFoo(@Reference Foo foo_a, @Reference Foo foo_b) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFooNamed.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFooNamed.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooFooNamed.java Mon Jun 4 23:26:08 2018 @@ -18,10 +18,9 @@ import javax.inject.Inject; import javax.inject.Named; import org.apache.aries.cdi.container.test.beans.Foo; -import org.osgi.service.cdi.annotations.Greedy; import org.osgi.service.cdi.annotations.Reference; public class CtorFooFooNamed { @Inject - public CtorFooFooNamed(@Greedy @Reference @Named("foo_a") Foo foo_a, @Greedy @Reference @Named("foo_b") Foo foo_b) {} + public CtorFooFooNamed(@Reference @Named("foo_a") Foo foo_a, @Reference @Named("foo_b") Foo foo_b) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooNamed.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooNamed.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooNamed.java Mon Jun 4 23:26:08 2018 @@ -18,10 +18,9 @@ import javax.inject.Inject; import javax.inject.Named; import org.apache.aries.cdi.container.test.beans.Foo; -import org.osgi.service.cdi.annotations.Greedy; import org.osgi.service.cdi.annotations.Reference; public class CtorFooNamed { @Inject - public CtorFooNamed(@Greedy @Reference @Named("_foo_") Foo foo) {} + public CtorFooNamed(@Reference @Named("_foo_") Foo foo) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooOptional.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooOptional.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooOptional.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorFooOptional.java Mon Jun 4 23:26:08 2018 @@ -19,10 +19,9 @@ import java.util.Optional; import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; -import org.osgi.service.cdi.annotations.Greedy; import org.osgi.service.cdi.annotations.Reference; public class CtorFooOptional { @Inject - public CtorFooOptional(@Greedy @Reference Optional<Foo> foo) {} + public CtorFooOptional(@Reference Optional<Foo> foo) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorListFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorListFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorListFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticgreedy/CtorListFoo.java Mon Jun 4 23:26:08 2018 @@ -19,10 +19,9 @@ import java.util.List; import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; -import org.osgi.service.cdi.annotations.Greedy; import org.osgi.service.cdi.annotations.Reference; public class CtorListFoo { @Inject - public CtorListFoo(@Greedy @Reference List<Foo> foos) {} + public CtorListFoo(@Reference List<Foo> foos) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorCollectionFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorCollectionFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorCollectionFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorCollectionFoo.java Mon Jun 4 23:26:08 2018 @@ -20,8 +20,9 @@ import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorCollectionFoo { @Inject - public CtorCollectionFoo(@Reference Collection<Foo> foos) {} + public CtorCollectionFoo(@Reluctant @Reference Collection<Foo> foos) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFoo.java Mon Jun 4 23:26:08 2018 @@ -18,8 +18,9 @@ import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFoo { @Inject - public CtorFoo(@Reference Foo foo) {} + public CtorFoo(@Reluctant @Reference Foo foo) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooBar.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooBar.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooBar.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooBar.java Mon Jun 4 23:26:08 2018 @@ -19,8 +19,9 @@ import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Bar; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooBar { @Inject - public CtorFooBar(@Reference Foo foo, @Reference Bar bar) {} + public CtorFooBar(@Reluctant @Reference Foo foo, @Reluctant @Reference Bar bar) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFoo.java Mon Jun 4 23:26:08 2018 @@ -18,8 +18,9 @@ import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooFoo { @Inject - public CtorFooFoo(@Reference Foo foo_a, @Reference Foo foo_b) {} + public CtorFooFoo(@Reluctant @Reference Foo foo_a, @Reluctant @Reference Foo foo_b) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFooNamed.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFooNamed.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooFooNamed.java Mon Jun 4 23:26:08 2018 @@ -19,8 +19,9 @@ import javax.inject.Named; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooFooNamed { @Inject - public CtorFooFooNamed(@Reference @Named("foo_a") Foo foo_a, @Reference @Named("foo_b") Foo foo_b) {} + public CtorFooFooNamed(@Reluctant @Reference @Named("foo_a") Foo foo_a, @Reluctant @Reference @Named("foo_b") Foo foo_b) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooNamed.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooNamed.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooNamed.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooNamed.java Mon Jun 4 23:26:08 2018 @@ -19,8 +19,9 @@ import javax.inject.Named; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooNamed { @Inject - public CtorFooNamed(@Reference @Named("_foo_") Foo foo) {} + public CtorFooNamed(@Reluctant @Reference @Named("_foo_") Foo foo) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooOptional.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooOptional.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooOptional.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorFooOptional.java Mon Jun 4 23:26:08 2018 @@ -20,8 +20,9 @@ import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorFooOptional { @Inject - public CtorFooOptional(@Reference Optional<Foo> foo) {} + public CtorFooOptional(@Reluctant @Reference Optional<Foo> foo) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorListFoo.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorListFoo.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorListFoo.java (original) +++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/ctorstaticreluctant/CtorListFoo.java Mon Jun 4 23:26:08 2018 @@ -20,8 +20,9 @@ import javax.inject.Inject; import org.apache.aries.cdi.container.test.beans.Foo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; public class CtorListFoo { @Inject - public CtorListFoo(@Reference List<Foo> foos) {} + public CtorListFoo(@Reluctant @Reference List<Foo> foos) {} } \ No newline at end of file Modified: aries/trunk/cdi/cdi-itests/logback.xml URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/logback.xml?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/logback.xml (original) +++ aries/trunk/cdi/cdi-itests/logback.xml Mon Jun 4 23:26:08 2018 @@ -27,10 +27,10 @@ </encoder> </appender> - <logger name="Events.Service.cdi-itests" level="INFO"/> - <logger name="Events.Service.org.apache.aries" level="INFO"/> + <!-- <logger name="Events.Service.cdi-itests" level="INFO"/> --> + <!-- <logger name="Events.Service.org.apache.aries" level="INFO"/> --> - <logger name="org.apache.aries.cdi" level="DEBUG"/> + <!-- <logger name="org.apache.aries.cdi" level="DEBUG"/> --> <logger name="org.eclipse" level="ERROR"/> <logger name="org.jboss" level="ERROR"/> Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb1/BeanImpl.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb1/BeanImpl.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb1/BeanImpl.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb1/BeanImpl.java Mon Jun 4 23:26:08 2018 @@ -20,6 +20,7 @@ import javax.inject.Named; import org.apache.aries.cdi.test.interfaces.BeanService; import org.apache.aries.cdi.test.interfaces.Pojo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; @Named("beanimpl") public class BeanImpl implements BeanService<BeanImpl> { @@ -35,6 +36,7 @@ public class BeanImpl implements BeanSer } @Inject + @Reluctant @Reference Pojo pojo; Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_AS.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_AS.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_AS.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_AS.java Mon Jun 4 23:26:08 2018 @@ -22,6 +22,7 @@ import javax.inject.Inject; import org.apache.aries.cdi.test.interfaces.BeanId; import org.apache.aries.cdi.test.interfaces.Pojo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; import org.osgi.service.cdi.annotations.Service; @BeanId("as") @@ -30,6 +31,7 @@ import org.osgi.service.cdi.annotations. public class OptionalReference_AS implements Pojo { @Inject + @Reluctant @Reference @BeanId("as") Optional<Integer> service; Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_FC.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_FC.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_FC.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_FC.java Mon Jun 4 23:26:08 2018 @@ -22,6 +22,7 @@ import org.apache.aries.cdi.test.interfa import org.apache.aries.cdi.test.interfaces.Pojo; import org.osgi.service.cdi.annotations.FactoryComponent; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; import org.osgi.service.cdi.annotations.Service; @BeanId("fc") @@ -31,6 +32,7 @@ public class OptionalReference_FC implem @BeanId("fc") @Inject + @Reluctant @Reference Optional<Integer> service; Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_SC.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_SC.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_SC.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/OptionalReference_SC.java Mon Jun 4 23:26:08 2018 @@ -21,6 +21,7 @@ import javax.inject.Inject; import org.apache.aries.cdi.test.interfaces.BeanId; import org.apache.aries.cdi.test.interfaces.Pojo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; import org.osgi.service.cdi.annotations.Service; import org.osgi.service.cdi.annotations.SingleComponent; @@ -31,6 +32,7 @@ public class OptionalReference_SC implem @BeanId("sc") @Inject + @Reluctant @Reference Optional<Integer> service; Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanA.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanA.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanA.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanA.java Mon Jun 4 23:26:08 2018 @@ -26,7 +26,7 @@ import javax.inject.Inject; import org.apache.aries.cdi.test.interfaces.BeanService; import org.osgi.service.cdi.ConfigurationPolicy; import org.osgi.service.cdi.annotations.BeanPropertyType; -import org.osgi.service.cdi.annotations.Configuration; +import org.osgi.service.cdi.annotations.ComponentProperties; import org.osgi.service.cdi.annotations.PID; import org.osgi.service.cdi.annotations.Service; import org.osgi.service.cdi.annotations.SingleComponent; @@ -58,7 +58,7 @@ public class ConfigurationBeanA implemen }; } - @Configuration + @ComponentProperties @Inject Config config; Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanB.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanB.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanB.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanB.java Mon Jun 4 23:26:08 2018 @@ -27,7 +27,7 @@ import javax.inject.Inject; import org.apache.aries.cdi.test.interfaces.BeanService; import org.osgi.service.cdi.ConfigurationPolicy; import org.osgi.service.cdi.annotations.BeanPropertyType; -import org.osgi.service.cdi.annotations.Configuration; +import org.osgi.service.cdi.annotations.ComponentProperties; import org.osgi.service.cdi.annotations.PID; import org.osgi.service.cdi.annotations.Service; import org.osgi.service.cdi.annotations.SingleComponent; @@ -60,7 +60,7 @@ public class ConfigurationBeanB implemen }; } - @Configuration + @ComponentProperties @Inject Map<String, Object> config; Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb5/ConfigurationBeanC.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb5/ConfigurationBeanC.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb5/ConfigurationBeanC.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb5/ConfigurationBeanC.java Mon Jun 4 23:26:08 2018 @@ -25,7 +25,7 @@ import javax.inject.Inject; import org.apache.aries.cdi.test.interfaces.BeanService; import org.osgi.service.cdi.annotations.BeanPropertyType; -import org.osgi.service.cdi.annotations.Configuration; +import org.osgi.service.cdi.annotations.ComponentProperties; import org.osgi.service.cdi.annotations.PID; import org.osgi.service.cdi.annotations.Service; import org.osgi.service.cdi.annotations.SingleComponent; @@ -57,7 +57,7 @@ public class ConfigurationBeanC implemen }; } - @Configuration + @ComponentProperties @Inject Config config; Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/RequestData.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/RequestData.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/RequestData.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/RequestData.java Mon Jun 4 23:26:08 2018 @@ -21,6 +21,7 @@ import javax.inject.Inject; import org.apache.aries.cdi.test.interfaces.Pojo; import org.osgi.service.cdi.annotations.Reference; +import org.osgi.service.cdi.annotations.Reluctant; @RequestScoped public class RequestData implements Serializable { @@ -41,6 +42,7 @@ public class RequestData implements Seri private String data; @Inject + @Reluctant @Reference Pojo pojo; Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb7/ConfigurationBeanF.java URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb7/ConfigurationBeanF.java?rev=1832901&r1=1832900&r2=1832901&view=diff ============================================================================== --- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb7/ConfigurationBeanF.java (original) +++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb7/ConfigurationBeanF.java Mon Jun 4 23:26:08 2018 @@ -25,7 +25,7 @@ import javax.inject.Inject; import org.apache.aries.cdi.test.interfaces.BeanService; import org.osgi.service.cdi.annotations.BeanPropertyType; -import org.osgi.service.cdi.annotations.Configuration; +import org.osgi.service.cdi.annotations.ComponentProperties; import org.osgi.service.cdi.annotations.FactoryComponent; import org.osgi.service.cdi.annotations.Service; @@ -55,7 +55,7 @@ public class ConfigurationBeanF implemen }; } - @Configuration + @ComponentProperties @Inject Config config;
