You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2018/09/12 13:44:55 UTC
svn commit: r1840685 - in /aries/trunk/cdi: cdi-extender/
cdi-extension-http/ cdi-extension-jndi/ cdi-extra/ cdi-itests/
cdi-itests/bnd/ cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/
cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/...
Author: rotty3000
Date: Wed Sep 12 13:44:54 2018
New Revision: 1840685
URL: http://svn.apache.org/viewvc?rev=1840685&view=rev
Log:
[CDI] apply bnd CDI support
Signed-off-by: Raymond Auge <ro...@apache.org>
Added:
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/package-info.java
- copied, changed from r1840274, aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/package-info.java
- copied, changed from r1840274, aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java
Removed:
aries/trunk/cdi/cdi-extension-http/bnd.bnd
aries/trunk/cdi/cdi-extension-jndi/bnd.bnd
aries/trunk/cdi/cdi-itests/bnd/tb4.bnd
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java
Modified:
aries/trunk/cdi/cdi-extender/bnd.bnd
aries/trunk/cdi/cdi-extra/bnd.bnd
aries/trunk/cdi/cdi-itests/bnd.bnd
aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd
aries/trunk/cdi/cdi-itests/bnd/services-one.bnd
aries/trunk/cdi/cdi-itests/bnd/tb1.bnd
aries/trunk/cdi/cdi-itests/bnd/tb10.bnd
aries/trunk/cdi/cdi-itests/bnd/tb11.bnd
aries/trunk/cdi/cdi-itests/bnd/tb2.bnd
aries/trunk/cdi/cdi-itests/bnd/tb3.bnd
aries/trunk/cdi/cdi-itests/bnd/tb5.bnd
aries/trunk/cdi/cdi-itests/bnd/tb6.bnd
aries/trunk/cdi/cdi-itests/bnd/tb7.bnd
aries/trunk/cdi/cdi-itests/bnd/tb8.bnd
aries/trunk/cdi/cdi-itests/bnd/tb9.bnd
aries/trunk/cdi/cdi-itests/pom.xml
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb1/BeanImpl.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb10/SingleReferenceEventHandler.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb2/PojoImpl.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb5/ConfigurationBeanC.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb7/ConfigurationBeanF.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/ContainerBean.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/SingleComponentBean.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb9/ContainerReferenceEventHandler.java
Modified: aries/trunk/cdi/cdi-extender/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/bnd.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-extender/bnd.bnd Wed Sep 12 13:44:54 2018
@@ -10,8 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+-cdiannotations:
-conditionalpackage: \
org.apache.felix.utils.extender,\
- org.osgi.util.converter
-
--contract: *
+ org.osgi.util.converter
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-extra/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/bnd.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-extra/bnd.bnd Wed Sep 12 13:44:54 2018
@@ -11,5 +11,6 @@
# limitations under the License.
Import-Package: javax.servlet;resolution:=optional, *
+-cdiannotations:
-contract: JavaServlet;resolution:=optional
-exportcontents: ${packages;VERSIONED}
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd.bnd Wed Sep 12 13:44:54 2018
@@ -14,6 +14,11 @@ Bundle-Description: Integration Test bun
Export-Package: ${p}.cases.*,${p}.interfaces.*
Test-Cases: ${classes;CONCRETE;ANNOTATED;org.junit.Test}
+# Disable processing at the root because using `-classpath` breaks
+# plugins like DS and CDI. Renable each one per `-make` bundle.
+-cdiannotations:
+-dsannotations:
+
##
## All of remainder is to make bnd's `-make` function work in our maven project.
##
@@ -35,7 +40,6 @@ p = org.apache.aries.cdi.test
tb1.jar,\
tb2.jar,\
tb3.jar,\
- tb4.jar,\
tb5.jar,\
tb6.jar,\
tb7.jar,\
Modified: aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/basic-beans.bnd Wed Sep 12 13:44:54 2018
@@ -11,8 +11,4 @@
# limitations under the License.
Export-Package: ${p}.beans.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.beans.*}',\
- osgi.cdi.extension;filter:="(osgi.cdi.extension=aries.cdi.jndi)"
\ No newline at end of file
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/services-one.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/services-one.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/services-one.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/services-one.bnd Wed Sep 12 13:44:54 2018
@@ -10,4 +10,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Export-Package: ${p}.components.*;-split-package:=first
\ No newline at end of file
+Export-Package: ${p}.components.*;-split-package:=first
+-dsannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb1.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb1.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb1.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb1.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb1.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb1.*}'
\ No newline at end of file
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb10.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb10.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb10.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb10.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb10.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb10.*}'
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb11.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb11.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb11.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb11.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb11.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb11.*}'
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb2.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb2.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb2.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb2.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb2.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb2.*}'
\ No newline at end of file
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb3.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb3.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb3.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb3.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb3.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb3.*}'
\ No newline at end of file
+-cdiannotations: *;discover=annotated
Modified: aries/trunk/cdi/cdi-itests/bnd/tb5.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb5.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb5.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb5.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb5.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb5.*}'
\ No newline at end of file
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb6.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb6.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb6.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb6.bnd Wed Sep 12 13:44:54 2018
@@ -11,8 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb6.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb6.*}',\
- osgi.cdi.extension;filter:="(osgi.cdi.extension=aries.cdi.http)"
+-cdiannotations: *;discover=all
Modified: aries/trunk/cdi/cdi-itests/bnd/tb7.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb7.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb7.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb7.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb7.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb7.*}'
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb8.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb8.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb8.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb8.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb8.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb8.*}'
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb9.bnd
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb9.bnd?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb9.bnd (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb9.bnd Wed Sep 12 13:44:54 2018
@@ -11,7 +11,4 @@
# limitations under the License.
Export-Package: ${p}.tb9.*;-split-package:=first
-Require-Capability:\
- osgi.extender;\
- filter:='(&(osgi.extender=osgi.cdi)(version>=1.0.0)(!(version>=2.0.0)))';\
- beans:List<String>='${classes;PUBLIC;CONCRETE;NAMED;${p}.tb9.*}'
+-cdiannotations: *
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/pom.xml?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/pom.xml (original)
+++ aries/trunk/cdi/cdi-itests/pom.xml Wed Sep 12 13:44:54 2018
@@ -47,7 +47,6 @@
<configuration>
<includes>
<include>META-INF/*</include>
- <include>OSGI-OPT/*</include>
<include>org/apache/aries/cdi/test/cases/*</include>
<include>org/apache/aries/cdi/test/interfaces/*</include>
<include>*.jar</include>
@@ -277,7 +276,7 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.3.0</version>
+ <version>1.4.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Copied: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/package-info.java (from r1840274, aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/package-info.java?p2=aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/package-info.java&p1=aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java&r1=1840274&r2=1840685&rev=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/package-info.java Wed Sep 12 13:44:54 2018
@@ -12,15 +12,13 @@
* limitations under the License.
*/
-package org.apache.aries.cdi.test.tb4;
+@Beans
+@Requirement(
+ namespace = CDIConstants.CDI_EXTENSION_PROPERTY,
+ name = "aries.cdi.jndi"
+)
+package org.apache.aries.cdi.test.beans;
-import java.util.concurrent.Callable;
-
-public class CallableImpl implements Callable<String> {
-
- @Override
- public String call() throws Exception {
- return getClass().getName();
- }
-
-}
+import org.osgi.annotation.bundle.Requirement;
+import org.osgi.service.cdi.CDIConstants;
+import org.osgi.service.cdi.annotations.Beans;
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/AbstractTestCase.java Wed Sep 12 13:44:54 2018
@@ -51,9 +51,11 @@ import org.osgi.namespace.service.Servic
import org.osgi.service.cdi.CDIConstants;
import org.osgi.service.cdi.runtime.CDIComponentRuntime;
import org.osgi.service.cdi.runtime.dto.ContainerDTO;
+import org.osgi.service.component.annotations.RequireServiceComponentRuntime;
import org.osgi.util.promise.PromiseFactory;
import org.osgi.util.tracker.ServiceTracker;
+@RequireServiceComponentRuntime
@Requirement(
effective = "active",
filter = "(objectClass=org.osgi.service.cm.ConfigurationAdmin)",
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=1840685&r1=1840684&r2=1840685&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 Wed Sep 12 13:44:54 2018
@@ -19,9 +19,11 @@ 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.Bean;
import org.osgi.service.cdi.annotations.Reference;
import org.osgi.service.cdi.annotations.Reluctant;
+@Bean
@Named("beanimpl")
public class BeanImpl implements BeanService<BeanImpl> {
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb10/SingleReferenceEventHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb10/SingleReferenceEventHandler.java?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb10/SingleReferenceEventHandler.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb10/SingleReferenceEventHandler.java Wed Sep 12 13:44:54 2018
@@ -21,10 +21,12 @@ import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.Pojo;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.cdi.annotations.Bean;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
import org.osgi.service.cdi.reference.BindServiceReference;
+@Bean
@Service
@SingleComponent
public class SingleReferenceEventHandler implements Pojo {
Copied: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/package-info.java (from r1840274, aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java)
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/package-info.java?p2=aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/package-info.java&p1=aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java&r1=1840274&r2=1840685&rev=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb4/CallableImpl.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb11/package-info.java Wed Sep 12 13:44:54 2018
@@ -12,15 +12,5 @@
* limitations under the License.
*/
-package org.apache.aries.cdi.test.tb4;
-
-import java.util.concurrent.Callable;
-
-public class CallableImpl implements Callable<String> {
-
- @Override
- public String call() throws Exception {
- return getClass().getName();
- }
-
-}
+@org.osgi.service.cdi.annotations.Beans
+package org.apache.aries.cdi.test.tb11;
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb2/PojoImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb2/PojoImpl.java?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb2/PojoImpl.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb2/PojoImpl.java Wed Sep 12 13:44:54 2018
@@ -15,8 +15,10 @@
package org.apache.aries.cdi.test.tb2;
import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.annotations.Bean;
import org.osgi.service.cdi.annotations.Service;
+@Bean
@Service
public class PojoImpl implements Pojo {
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=1840685&r1=1840684&r2=1840685&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 Wed Sep 12 13:44:54 2018
@@ -24,12 +24,14 @@ import java.util.concurrent.Callable;
import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.BeanService;
+import org.osgi.service.cdi.annotations.Bean;
import org.osgi.service.cdi.annotations.BeanPropertyType;
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;
+@Bean
@Service(BeanService.class)
@SingleComponent
@PID("foo.bar")
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BarServlet.java Wed Sep 12 13:44:54 2018
@@ -29,10 +29,16 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.osgi.annotation.bundle.Requirement;
+import org.osgi.service.cdi.CDIConstants;
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
+@Requirement(
+ namespace = CDIConstants.CDI_EXTENSION_PROPERTY,
+ name = "aries.cdi.http"
+)
@SingleComponent
@Service(Servlet.class)
@BarServlet.Props
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=1840685&r1=1840684&r2=1840685&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 Wed Sep 12 13:44:54 2018
@@ -24,11 +24,13 @@ import java.util.concurrent.Callable;
import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.BeanService;
+import org.osgi.service.cdi.annotations.Bean;
import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.ComponentProperties;
import org.osgi.service.cdi.annotations.FactoryComponent;
import org.osgi.service.cdi.annotations.Service;
+@Bean
@Service({BeanService.class, ConfigurationBeanF.class})
@FactoryComponent
@ConfigurationBeanF.Props
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/ContainerBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/ContainerBean.java?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/ContainerBean.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/ContainerBean.java Wed Sep 12 13:44:54 2018
@@ -17,8 +17,10 @@ package org.apache.aries.cdi.test.tb8;
import javax.enterprise.context.ApplicationScoped;
import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.annotations.Bean;
import org.osgi.service.cdi.annotations.Service;
+@Bean
@ApplicationScoped
@Service({Pojo.class, ContainerBean.class})
public class ContainerBean implements Pojo {
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/SingleComponentBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/SingleComponentBean.java?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/SingleComponentBean.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb8/SingleComponentBean.java Wed Sep 12 13:44:54 2018
@@ -15,9 +15,11 @@
package org.apache.aries.cdi.test.tb8;
import org.apache.aries.cdi.test.interfaces.Pojo;
+import org.osgi.service.cdi.annotations.Bean;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
+@Bean
@SingleComponent
@Service({Pojo.class, SingleComponentBean.class})
public class SingleComponentBean implements Pojo {
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb9/ContainerReferenceEventHandler.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb9/ContainerReferenceEventHandler.java?rev=1840685&r1=1840684&r2=1840685&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb9/ContainerReferenceEventHandler.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb9/ContainerReferenceEventHandler.java Wed Sep 12 13:44:54 2018
@@ -21,9 +21,11 @@ import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.Pojo;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.cdi.annotations.Bean;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.reference.BindServiceReference;
+@Bean
@ApplicationScoped
@Service
public class ContainerReferenceEventHandler implements Pojo {