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 2017/09/05 22:01:15 UTC
svn commit: r1807424 [8/8] - in /aries/trunk/cdi: ./ cdi-extender/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/
cdi-extender/src/main/java/org/apache/aries/...
Modified: aries/trunk/cdi/cdi-itests/bnd/basic-beans.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/basic-beans.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/basic-beans.xml (original)
+++ aries/trunk/cdi/cdi-itests/bnd/basic-beans.xml Tue Sep 5 22:01:11 2017
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
- <cdi:bean class="org.apache.aries.cdi.test.beans.BeanWithReference" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.BundleContextBean" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.CdiEventObserver" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.ConstructorInjectedService" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.FieldInjectedBundleScopedImpl" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.FieldInjectedPrototypeScopedImpl" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.FieldInjectedService" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.Instance_Optional" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.Instance_ServiceProperties" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.Instance_ServiceReference" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.MethodInjectedService" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.PojoImpl" />
- <cdi:bean class="org.apache.aries.cdi.test.beans.ServiceWithProperties" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.BeanWithReference" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.BundleContextBean" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.CdiEventObserver" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.ConstructorInjectedService" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.FieldInjectedBundleScopedImpl" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.FieldInjectedPrototypeScopedImpl" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.FieldInjectedService" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.Instance_Optional" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.Instance_ServiceProperties" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.Instance_ServiceReference" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.MethodInjectedService" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.PojoImpl" />
+ <cdi:component class="org.apache.aries.cdi.test.beans.ServiceWithProperties" />
</beans>
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb1-beans.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb1-beans.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb1-beans.xml (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb1-beans.xml Tue Sep 5 22:01:11 2017
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
- <cdi:bean class="org.apache.aries.cdi.test.tb1.BeanImpl" />
- <cdi:reference
- beanClass="org.apache.aries.cdi.test.interfaces.Pojo"
- target="(objectClass=org.apache.aries.cdi.test.interfaces.Pojo)" />
+ <cdi:component class="org.apache.aries.cdi.test.tb1.BeanImpl">
+ <reference
+ service="org.apache.aries.cdi.test.interfaces.Pojo"
+ target="(objectClass=org.apache.aries.cdi.test.interfaces.Pojo)" />
+ </cdi:component>
</beans>
\ No newline at end of file
Modified: aries/trunk/cdi/cdi-itests/bnd/tb2-beans.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb2-beans.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb2-beans.xml (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb2-beans.xml Tue Sep 5 22:01:11 2017
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdi:bean class="org.apache.aries.cdi.test.tb2.PojoImpl" xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
- <service>
- <provide interface="org.apache.aries.cdi.test.interfaces.Pojo" />
- </service>
-</cdi:bean>
+<cdi:component class="org.apache.aries.cdi.test.tb2.PojoImpl" service-scope="singleton" xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
+ <provide interface="org.apache.aries.cdi.test.interfaces.Pojo" />
+</cdi:component>
Modified: aries/trunk/cdi/cdi-itests/bnd/tb3-beans.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb3-beans.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb3-beans.xml (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb3-beans.xml Tue Sep 5 22:01:11 2017
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
- <cdi:bean class="org.apache.aries.cdi.test.tb3.ConfigurationBeanA" />
- <cdi:bean class="org.apache.aries.cdi.test.tb3.ConfigurationBeanB" />
+ <cdi:component class="org.apache.aries.cdi.test.tb3.ConfigurationBeanA" />
+ <cdi:component class="org.apache.aries.cdi.test.tb3.ConfigurationBeanB" />
</beans>
Modified: aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb4-beans.xml Tue Sep 5 22:01:11 2017
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<cdi:bean class="org.apache.aries.cdi.test.tb4.CallableImpl" xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
- <service>
- <property name="a.service.property" value="The Value" type="String"/>
- <provide interface="java.util.concurrent.Callable" />
- </service>
-</cdi:bean>
+<cdi:component class="org.apache.aries.cdi.test.tb4.CallableImpl" xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
+ <property name="a.service.property" value="The Value" type="String"/>
+ <provide interface="java.util.concurrent.Callable" />
+</cdi:component>
Modified: aries/trunk/cdi/cdi-itests/bnd/tb5-beans.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb5-beans.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb5-beans.xml (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb5-beans.xml Tue Sep 5 22:01:11 2017
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
- <cdi:bean class="org.apache.aries.cdi.test.tb5.ConfigurationBeanC" />
+ <cdi:component class="org.apache.aries.cdi.test.tb5.ConfigurationBeanC" />
</beans>
Modified: aries/trunk/cdi/cdi-itests/bnd/tb6-beans.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/bnd/tb6-beans.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/bnd/tb6-beans.xml (original)
+++ aries/trunk/cdi/cdi-itests/bnd/tb6-beans.xml Tue Sep 5 22:01:11 2017
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns:cdi="http://www.osgi.org/xmlns/cdi/v1.0.0">
- <cdi:bean class="org.apache.aries.cdi.test.tb6.BeanServlet" />
- <cdi:bean class="org.apache.aries.cdi.test.tb6.SessionBean" />
+ <cdi:component class="org.apache.aries.cdi.test.tb6.BeanServlet" />
+ <cdi:component class="org.apache.aries.cdi.test.tb6.SessionBean" />
</beans>
Modified: aries/trunk/cdi/cdi-itests/cdi-executable.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/cdi-executable.bndrun?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/cdi-executable.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/cdi-executable.bndrun Tue Sep 5 22:01:11 2017
@@ -11,11 +11,12 @@
osgi.identity;filter:='(osgi.identity=org.apache.felix.configadmin)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.jline)',\
- osgi.identity;filter:='(osgi.identity=slf4j.log4j12)'
+ osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)'
-runbundles: \
+ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
jboss-classfilewriter;version='[1.1.2,1.1.3)',\
- log4j;version='[1.2.17,1.2.18)',\
org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\
org.apache.aries.cdi.extension.http;version='[0.0.1,0.0.2)',\
org.apache.aries.cdi.extension.jndi;version='[0.0.1,0.0.2)',\
@@ -35,21 +36,19 @@
org.apache.geronimo.specs.geronimo-annotation_1.2_spec;version='[1.0.0,1.0.1)',\
org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\
org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\
- org.jboss.weld.osgi-bundle;version='[2.4.2,2.4.3)',\
+ org.jboss.weld.osgi-bundle;version='[2.4.3,2.4.4)',\
org.jline;version='[3.0.0,3.0.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.service.event;version='[1.3.1,1.3.2)',\
- slf4j.api;version='[1.7.21,1.7.22)',\
- slf4j.log4j12;version='[1.6.1,1.6.2)'
+ slf4j.api;version='[1.7.25,1.7.26)'
-resolve.effective: resolve, active
-runee: JavaSE-1.8
--runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+-runfw: org.eclipse.osgi;version='[3.10.0,4.0.0)'
-runproperties: \
- osgi.console.enable.builtin=false, \
- osgi.console=, \
- org.osgi.service.http.port=8080,\
+ logback.configurationFile=file:${.}/logback.xml,\
org.jboss.logging.provider=slf4j,\
- log4j.configuration=file:${.}/log4j.properties
+ org.osgi.service.http.port=8080,\
+ osgi.console.enable.builtin=false, \
+ osgi.console=
-runsystemcapabilities.dflt: ${native_capability}
--runsystempackages: javax.script
Modified: aries/trunk/cdi/cdi-itests/itest.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/itest.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/itest.bndrun Tue Sep 5 22:01:11 2017
@@ -9,11 +9,12 @@
osgi.identity;filter:='(osgi.identity=org.apache.aries.jndi.core)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.shell)',\
- osgi.identity;filter:='(osgi.identity=slf4j.log4j12)'
+ osgi.identity;filter:='(osgi.identity=ch.qos.logback.classic)'
-runbundles: \
+ ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+ ch.qos.logback.core;version='[1.2.3,1.2.4)',\
jboss-classfilewriter;version='[1.1.2,1.1.3)',\
- log4j;version='[1.2.17,1.2.18)',\
org.apache.aries.cdi.extender;version='[0.0.1,0.0.2)',\
org.apache.aries.cdi.extension.http;version='[0.0.1,0.0.2)',\
org.apache.aries.cdi.extension.jndi;version='[0.0.1,0.0.2)',\
@@ -38,22 +39,20 @@
org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
org.apache.logging.log4j.api;version='[2.7.0,2.7.1)',\
org.jboss.logging.jboss-logging;version='[3.2.1,3.2.2)',\
- org.jboss.weld.osgi-bundle;version='[2.4.2,2.4.3)',\
+ org.jboss.weld.osgi-bundle;version='[2.4.3,2.4.4)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.service.event;version='[1.3.1,1.3.2)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
- slf4j.api;version='[1.7.21,1.7.22)',\
- slf4j.log4j12;version='[1.6.1,1.6.2)'
+ slf4j.api;version='[1.7.25,1.7.26)'
-resolve.effective: resolve, active
-runee: JavaSE-1.8
-runsystemcapabilities: ${native_capability}
--runfw: org.eclipse.osgi;version='[3.10.100.v20150529-1857,3.10.100.v20150529-1857]'
+-runfw: org.eclipse.osgi;version='[3.10.0,4.0.0)'
-runproperties: \
- osgi.console.enable.builtin=false, \
- osgi.console=, \
- org.osgi.service.http.port=8080,\
+ logback.configurationFile=file:${.}/logback.xml,\
org.jboss.logging.provider=slf4j,\
- log4j.configuration=file:${.}/log4j.properties
--runsystempackages: javax.script
+ org.osgi.service.http.port=8080,\
+ osgi.console.enable.builtin=false, \
+ osgi.console=
Added: aries/trunk/cdi/cdi-itests/logback.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/logback.xml?rev=1807424&view=auto
==============================================================================
--- aries/trunk/cdi/cdi-itests/logback.xml (added)
+++ aries/trunk/cdi/cdi-itests/logback.xml Tue Sep 5 22:01:11 2017
@@ -0,0 +1,17 @@
+<configuration>
+ <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
+ <resetJUL>true</resetJUL>
+ </contextListener>
+
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.apache.aries.cdi.container" level="DEBUG"/>
+
+ <root level="info">
+ <appender-ref ref="STDOUT" />
+ </root>
+</configuration>
\ 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=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/pom.xml (original)
+++ aries/trunk/cdi/cdi-itests/pom.xml Tue Sep 5 22:01:11 2017
@@ -104,9 +104,14 @@
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>1.7.25</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.2.3</version>
</dependency>
<dependency>
<groupId>org.apache.aries.cdi</groupId>
@@ -204,9 +209,9 @@
<version>1.4.100.v20150408-1437</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
+ <groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.10.100.v20150529-1857</version>
+ <version>3.11.3</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -252,15 +257,5 @@
<artifactId>osgi.core</artifactId>
<version>6.0.0</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.7.21</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- </dependency>
</dependencies>
</project>
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ConstructorInjectedService.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ConstructorInjectedService.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ConstructorInjectedService.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ConstructorInjectedService.java Tue Sep 5 22:01:11 2017
@@ -15,14 +15,16 @@
package org.apache.aries.cdi.test.beans;
import javax.inject.Inject;
-import javax.inject.Singleton;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.apache.aries.cdi.test.interfaces.Pojo;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.Component;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(type = {ConstructorInjectedService.class, BeanService.class})
-@Singleton
+@Component(
+ service = {ConstructorInjectedService.class, BeanService.class},
+ serviceScope = ServiceScope.SINGLETON
+)
public class ConstructorInjectedService implements BeanService<Pojo> {
@Inject
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedBundleScopedImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedBundleScopedImpl.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedBundleScopedImpl.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedBundleScopedImpl.java Tue Sep 5 22:01:11 2017
@@ -19,17 +19,19 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import javax.inject.Singleton;
import org.apache.aries.cdi.test.interfaces.BundleScoped;
import org.apache.aries.cdi.test.interfaces.FieldInjectedReference;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.cdi.annotations.Component;
import org.osgi.service.cdi.annotations.Reference;
import org.osgi.service.cdi.annotations.ReferenceScope;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(type = {FieldInjectedBundleScopedImpl.class, FieldInjectedReference.class})
-@Singleton
+@Component(
+ service = {FieldInjectedBundleScopedImpl.class, FieldInjectedReference.class},
+ serviceScope = ServiceScope.SINGLETON
+)
public class FieldInjectedBundleScopedImpl implements FieldInjectedReference<BundleScoped> {
@Inject
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedPrototypeScopedImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedPrototypeScopedImpl.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedPrototypeScopedImpl.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedPrototypeScopedImpl.java Tue Sep 5 22:01:11 2017
@@ -19,17 +19,19 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Inject;
-import javax.inject.Singleton;
import org.apache.aries.cdi.test.interfaces.FieldInjectedReference;
import org.apache.aries.cdi.test.interfaces.PrototypeScoped;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.cdi.annotations.Component;
import org.osgi.service.cdi.annotations.Reference;
import org.osgi.service.cdi.annotations.ReferenceScope;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(type = {FieldInjectedPrototypeScopedImpl.class, FieldInjectedReference.class})
-@Singleton
+@Component(
+ service = {FieldInjectedPrototypeScopedImpl.class, FieldInjectedReference.class},
+ serviceScope = ServiceScope.SINGLETON
+)
public class FieldInjectedPrototypeScopedImpl implements FieldInjectedReference<PrototypeScoped> {
@Inject
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedService.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedService.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedService.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedService.java Tue Sep 5 22:01:11 2017
@@ -15,14 +15,16 @@
package org.apache.aries.cdi.test.beans;
import javax.inject.Inject;
-import javax.inject.Singleton;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.apache.aries.cdi.test.interfaces.Pojo;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.Component;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(type = {FieldInjectedService.class, BeanService.class})
-@Singleton
+@Component(
+ service = {FieldInjectedService.class, BeanService.class},
+ serviceScope = ServiceScope.SINGLETON
+)
public class FieldInjectedService implements BeanService<Pojo> {
@Override
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_Optional.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_Optional.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_Optional.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_Optional.java Tue Sep 5 22:01:11 2017
@@ -19,14 +19,17 @@ import java.util.concurrent.Callable;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
-import javax.inject.Singleton;
import org.apache.aries.cdi.test.interfaces.BeanService;
+import org.osgi.service.cdi.annotations.Component;
import org.osgi.service.cdi.annotations.Reference;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ReferenceCardinality;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(type = {BeanService.class, Instance_Optional.class})
-@Singleton
+@Component(
+ service = {BeanService.class, Instance_Optional.class},
+ serviceScope = ServiceScope.SINGLETON
+)
public class Instance_Optional implements BeanService<Callable<String>> {
@Override
@@ -46,7 +49,7 @@ public class Instance_Optional implement
}
@Inject
- @Reference
+ @Reference(cardinality = ReferenceCardinality.MULTIPLE)
Instance<Callable<String>> _instance;
}
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceProperties.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceProperties.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceProperties.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceProperties.java Tue Sep 5 22:01:11 2017
@@ -23,11 +23,15 @@ import javax.inject.Singleton;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.apache.aries.cdi.test.interfaces.SingletonScoped;
+import org.osgi.service.cdi.annotations.Component;
import org.osgi.service.cdi.annotations.Reference;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ReferenceCardinality;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(type = {BeanService.class, Instance_ServiceProperties.class})
-@Singleton
+@Component(
+ service = {BeanService.class, Instance_ServiceProperties.class},
+ serviceScope = ServiceScope.SINGLETON
+)
public class Instance_ServiceProperties implements BeanService<Map<String, Object>> {
@Override
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceReference.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceReference.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceReference.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceReference.java Tue Sep 5 22:01:11 2017
@@ -18,16 +18,19 @@ import java.util.Iterator;
import javax.enterprise.inject.Instance;
import javax.inject.Inject;
-import javax.inject.Singleton;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.apache.aries.cdi.test.interfaces.SingletonScoped;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.cdi.annotations.Component;
import org.osgi.service.cdi.annotations.Reference;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ReferenceCardinality;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(type = {BeanService.class, Instance_ServiceReference.class})
-@Singleton
+@Component(
+ service = {BeanService.class, Instance_ServiceReference.class},
+ serviceScope = ServiceScope.SINGLETON
+)
@SuppressWarnings("rawtypes")
public class Instance_ServiceReference implements BeanService<ServiceReference> {
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/MethodInjectedService.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/MethodInjectedService.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/MethodInjectedService.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/MethodInjectedService.java Tue Sep 5 22:01:11 2017
@@ -15,14 +15,16 @@
package org.apache.aries.cdi.test.beans;
import javax.inject.Inject;
-import javax.inject.Singleton;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.apache.aries.cdi.test.interfaces.Pojo;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.Component;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(type = {MethodInjectedService.class, BeanService.class})
-@Singleton
+@Component(
+ service = {MethodInjectedService.class, BeanService.class},
+ serviceScope = ServiceScope.SINGLETON
+)
public class MethodInjectedService implements BeanService<Pojo> {
@Inject
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ServiceWithProperties.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ServiceWithProperties.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ServiceWithProperties.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ServiceWithProperties.java Tue Sep 5 22:01:11 2017
@@ -26,9 +26,10 @@ import javax.inject.Singleton;
import org.apache.aries.cdi.test.beans.ServiceWithProperties.MoreProperties;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.apache.aries.cdi.test.interfaces.Pojo;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.Component;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(
+@Component(
property = {
"test.key.b1=test.value.b1",
"test.key.b2=test.value.b2",
@@ -140,9 +141,9 @@ import org.osgi.service.cdi.annotations.
"p.String.set:Set<String>=green",
"p.String.set:Set<String>=black"
},
- type = {ServiceWithProperties.class, BeanService.class}
+ service = {ServiceWithProperties.class, BeanService.class},
+ serviceScope = ServiceScope.SINGLETON
)
-@Singleton
@MoreProperties(glub_integer = 45, goo_string = "green")
public class ServiceWithProperties implements BeanService<Pojo> {
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/CdiBeanTests.java Tue Sep 5 22:01:11 2017
@@ -28,6 +28,7 @@ import javax.enterprise.util.AnnotationL
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.apache.aries.cdi.test.interfaces.BundleContextBeanQualifier;
import org.apache.aries.cdi.test.interfaces.FieldInjectedReference;
+import org.junit.Ignore;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
@@ -247,7 +248,8 @@ public class CdiBeanTests extends Abstra
assertTrue(bti.get() instanceof BundleContext);
}
- public void testInstanceProperties() throws Exception {
+ @Ignore // This test doesn't make sense because there's only a single bean for the reference!!!
+ public void _testInstanceProperties() throws Exception {
Iterator<ServiceReference<BeanService>> iterator = bundleContext.getServiceReferences(
BeanService.class, String.format("(objectClass=*.%s)","Instance_ServiceProperties")).iterator();
@@ -266,7 +268,8 @@ public class CdiBeanTests extends Abstra
assertNotNull(map);
}
- public void testInstanceServiceReference() throws Exception {
+ @Ignore // This test doesn't make sense because there's only a single bean for the reference!!!
+ public void _testInstanceServiceReference() throws Exception {
Iterator<ServiceReference<BeanService>> iterator = bundleContext.getServiceReferences(
BeanService.class, String.format("(objectClass=*.%s)","Instance_ServiceReference")).iterator();
@@ -285,7 +288,8 @@ public class CdiBeanTests extends Abstra
assertNotNull(sr);
}
- public void testInstance_Optional() throws Exception {
+ @Ignore // This test doesn't make sense because there's only a single bean for the reference!!!
+ public void _testInstance_Optional() throws Exception {
Iterator<ServiceReference<BeanService>> iterator = bundleContext.getServiceReferences(
BeanService.class, String.format("(objectClass=*.%s)","Instance_Optional")).iterator();
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/ConfigurationTests.java Tue Sep 5 22:01:11 2017
@@ -65,13 +65,13 @@ public class ConfigurationTests extends
CdiEvent.Type.WAITING_FOR_CONFIGURATIONS,
serviceReference.getProperty(CdiConstants.CDI_CONTAINER_STATE));
- configurationA = configurationAdmin.getConfiguration("configA", "?");
+ configurationA = configurationAdmin.getConfiguration("org.apache.aries.cdi.test.tb3.ConfigurationBeanA", "?");
Dictionary<String, Object> properties = new Hashtable<>();
properties.put("ports", new int[] {12, 4567});
configurationA.update(properties);
- configurationB = configurationAdmin.getConfiguration("configB", "?");
+ configurationB = configurationAdmin.getConfiguration("org.apache.aries.cdi.test.tb3.ConfigurationBeanB", "?");
properties = new Hashtable<>();
properties.put("color", "green");
@@ -133,85 +133,6 @@ public class ConfigurationTests extends
}
}
- @SuppressWarnings({ "unchecked", "serial" })
- public void testNamedConfiguration() throws Exception {
- Bundle tb3Bundle = installBundle("tb3.jar");
-
- Configuration configurationA = null, configurationB = null;
-
- try {
- configurationA = configurationAdmin.getConfiguration("configA", "?");
-
- Dictionary<String, Object> properties = new Hashtable<>();
- properties.put("ports", new int[] {12, 4567});
- configurationA.update(properties);
-
- configurationB = configurationAdmin.getConfiguration("configB", "?");
-
- properties = new Hashtable<>();
- properties.put("color", "green");
- properties.put("ports", new int[] {80});
- configurationB.update(properties);
-
- Filter filter = bundleContext.createFilter(
- "(&(objectClass=" + CdiContainer.class.getName() + ")(service.bundleid=" + tb3Bundle.getBundleId() +
- ")(" + CdiConstants.CDI_CONTAINER_STATE + "=CREATED))");
-
- ServiceTracker<CdiContainer, CdiContainer> st = new ServiceTracker<>(bundleContext, filter, null);
-
- st.open();
-
- CdiContainer container = st.waitForService(timeout);
-
- assertNotNull(container);
-
- int t = st.getTrackingCount();
-
- BeanManager beanManager = container.getBeanManager();
- Set<Bean<?>> beans = beanManager.getBeans("configB");
- assertNotNull(beans);
- Bean<? extends Object> bean = beanManager.resolve(beans);
- CreationalContext<?> ctx = beanManager.createCreationalContext(bean);
-
- Map<String, Object> config = (Map<String, Object>)beanManager.getReference(
- bean, new TypeLiteral<Map<String, Object>>() {}.getType(), ctx);
-
- assertNotNull(config);
- assertEquals("green", config.get("color"));
-
- assertArrayEquals(new int[] {80}, (int[])config.get("ports"));
-
- configurationA.delete();
-
- while (t == st.getTrackingCount()) {Thread.sleep(10);}
-
- assertTrue(st.isEmpty());
-
- st.close();
-
- filter = bundleContext.createFilter(
- "(&(objectClass=" + CdiContainer.class.getName() + ")(service.bundleid=" + tb3Bundle.getBundleId() +
- ")(" + CdiConstants.CDI_CONTAINER_STATE + "=" + CdiEvent.Type.WAITING_FOR_CONFIGURATIONS + "))");
-
- st = new ServiceTracker<>(bundleContext, filter, null);
-
- st.open();
-
- assertFalse(st.isEmpty());
- }
- finally {
- if (configurationB != null) {
- try {
- configurationB.delete();
- }
- catch (Exception e) {
- // ignore
- }
- }
- tb3Bundle.uninstall();
- }
- }
-
@SuppressWarnings({ "rawtypes", "unchecked" })
public void testOptionalConfiguration() throws Exception {
Bundle tb5Bundle = installBundle("tb5.jar");
@@ -236,8 +157,6 @@ public class ConfigurationTests extends
BeanService<Callable<int[]>> beanService = stC.waitForService(timeout);
- int t = stC.getTrackingCount();
-
assertNotNull(beanService);
assertEquals("blue", beanService.doSomething());
assertArrayEquals(new int[] {35777}, beanService.get().call());
@@ -248,11 +167,11 @@ public class ConfigurationTests extends
properties.put("ports", new int[] {12, 4567});
configurationC.update(properties);
- while (t == stC.getTrackingCount()) {Thread.sleep(10);}
- t = stC.getTrackingCount();
-
- while (t == stC.getTrackingCount()) {Thread.sleep(10);}
- t = stC.getTrackingCount();
+ stC.close();
+ stC = new ServiceTracker<BeanService, BeanService>(
+ bundleContext, bundleContext.createFilter(
+ "(&(objectClass=org.apache.aries.cdi.test.interfaces.BeanService)(bean=C)(ports=12))"), null);
+ stC.open(true);
beanService = stC.waitForService(timeout);
@@ -262,8 +181,11 @@ public class ConfigurationTests extends
configurationC.delete();
- while (t == stC.getTrackingCount()) {Thread.sleep(10);}
-
+ stC.close();
+ stC = new ServiceTracker<BeanService, BeanService>(
+ bundleContext, bundleContext.createFilter(
+ "(&(objectClass=org.apache.aries.cdi.test.interfaces.BeanService)(bean=C)(!(ports=*)))"), null);
+ stC.open(true);
beanService = stC.waitForService(timeout);
assertNotNull(beanService);
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/EventsTests.java Tue Sep 5 22:01:11 2017
@@ -49,7 +49,7 @@ public class EventsTests extends Abstrac
BeanService<List<CdiEvent>> bti = (BeanService<List<CdiEvent>>)bcb;
List<CdiEvent> list = bti.get();
assertNotNull(list);
- assertEquals(3, list.size());
+ assertEquals(1, list.size());
}
}
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=1807424&r1=1807423&r2=1807424&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 Tue Sep 5 22:01:11 2017
@@ -17,13 +17,17 @@ package org.apache.aries.cdi.test.tb3;
import java.util.concurrent.Callable;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.aries.cdi.test.interfaces.BeanService;
+import org.osgi.service.cdi.annotations.Component;
import org.osgi.service.cdi.annotations.Configuration;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ConfigurationPolicy;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(property = "bean=A")
+@Component(
+ property = "bean=A",
+ serviceScope = ServiceScope.SINGLETON
+)
public class ConfigurationBeanA implements BeanService<Callable<int[]>> {
@Override
@@ -41,9 +45,8 @@ public class ConfigurationBeanA implemen
};
}
- @Configuration
+ @Configuration(configurationPolicy = ConfigurationPolicy.REQUIRE)
@Inject
- @Named("configA")
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=1807424&r1=1807423&r2=1807424&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 Tue Sep 5 22:01:11 2017
@@ -18,13 +18,17 @@ import java.util.Map;
import java.util.concurrent.Callable;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.aries.cdi.test.interfaces.BeanService;
+import org.osgi.service.cdi.annotations.Component;
import org.osgi.service.cdi.annotations.Configuration;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ConfigurationPolicy;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(property = "bean=B")
+@Component(
+ property = "bean=B",
+ serviceScope = ServiceScope.SINGLETON
+)
public class ConfigurationBeanB implements BeanService<Callable<int[]>> {
@Override
@@ -42,9 +46,11 @@ public class ConfigurationBeanB implemen
};
}
- @Configuration({"$", "configA"})
+ @Configuration(
+ configurationPolicy = ConfigurationPolicy.REQUIRE,
+ value = {"org.apache.aries.cdi.test.tb3.ConfigurationBeanA", "$"}
+ )
@Inject
- @Named("configB")
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=1807424&r1=1807423&r2=1807424&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 Tue Sep 5 22:01:11 2017
@@ -17,13 +17,14 @@ package org.apache.aries.cdi.test.tb5;
import java.util.concurrent.Callable;
import javax.inject.Inject;
-import javax.inject.Named;
import org.apache.aries.cdi.test.interfaces.BeanService;
+import org.osgi.service.cdi.annotations.Component;
import org.osgi.service.cdi.annotations.Configuration;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.ConfigurationPolicy;
+import org.osgi.service.cdi.annotations.ServiceScope;
-@Service(property = "bean=C")
+@Component(property = "bean=C", serviceScope = ServiceScope.SINGLETON)
public class ConfigurationBeanC implements BeanService<Callable<int[]>> {
@Override
@@ -41,9 +42,8 @@ public class ConfigurationBeanC implemen
};
}
- @Configuration(required = false, value = "foo.bar")
+ @Configuration(value = "foo.bar")
@Inject
- @Named("configC")
Config config;
}
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BeanServlet.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BeanServlet.java?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BeanServlet.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/BeanServlet.java Tue Sep 5 22:01:11 2017
@@ -24,15 +24,17 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.annotations.Component;
+import org.osgi.service.cdi.annotations.ServiceScope;
import org.osgi.service.http.whiteboard.HttpWhiteboardConstants;
-@Service(
+@Component(
property = {
HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_NAME + "=foo",
HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN + "=/foo"
},
- type = Servlet.class
+ service = Servlet.class,
+ serviceScope = ServiceScope.SINGLETON
)
public class BeanServlet extends HttpServlet {
Modified: aries/trunk/cdi/javax.cdi-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.cdi-api/pom.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/javax.cdi-api/pom.xml (original)
+++ aries/trunk/cdi/javax.cdi-api/pom.xml Tue Sep 5 22:01:11 2017
@@ -40,6 +40,26 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceIncludes>
+ <dependencySourceInclude>javax.enterprise:cdi-api</dependencySourceInclude>
+ </dependencySourceIncludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: aries/trunk/cdi/javax.el-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.el-api/pom.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/javax.el-api/pom.xml (original)
+++ aries/trunk/cdi/javax.el-api/pom.xml Tue Sep 5 22:01:11 2017
@@ -40,6 +40,26 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceIncludes>
+ <dependencySourceInclude>org.apache.tomcat:tomcat-el-api</dependencySourceInclude>
+ </dependencySourceIncludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: aries/trunk/cdi/javax.inject-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.inject-api/pom.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/javax.inject-api/pom.xml (original)
+++ aries/trunk/cdi/javax.inject-api/pom.xml Tue Sep 5 22:01:11 2017
@@ -40,6 +40,26 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceIncludes>
+ <dependencySourceInclude>javax.inject:javax.inject</dependencySourceInclude>
+ </dependencySourceIncludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: aries/trunk/cdi/javax.interceptor-api/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/javax.interceptor-api/pom.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/javax.interceptor-api/pom.xml (original)
+++ aries/trunk/cdi/javax.interceptor-api/pom.xml Tue Sep 5 22:01:11 2017
@@ -40,6 +40,26 @@
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <executions>
+ <execution>
+ <id>javadoc-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceIncludes>
+ <dependencySourceInclude>org.apache.geronimo.specs:geronimo-interceptor_1.2_spec</dependencySourceInclude>
+ </dependencySourceIncludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
Modified: aries/trunk/cdi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1807424&r1=1807423&r2=1807424&view=diff
==============================================================================
--- aries/trunk/cdi/pom.xml (original)
+++ aries/trunk/cdi/pom.xml Tue Sep 5 22:01:11 2017
@@ -35,7 +35,7 @@
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
- <bnd.version>3.4.0-SNAPSHOT</bnd.version>
+ <bnd.version>3.4.0</bnd.version>
<full.version>${project.version} (${timestamp} AD)</full.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.version>2.12</surefire.version>
@@ -128,6 +128,7 @@
<goals>
<goal>resolve</goal>
</goals>
+ <phase>package</phase>
</execution>
</executions>
</plugin>
@@ -152,7 +153,7 @@
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
- </configuration>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -245,56 +246,27 @@
</plugins>
</reporting>
- <profiles>
- <profile>
- <id>release</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-gpg-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<repositories>
<repository>
- <id>osgi-snapshots</id>
- <url>https://oss.sonatype.org/content/groups/osgi/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <id>bnd-snapshots</id>
- <url>https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles/</url>
+ <id>apache-snapshots</id>
+ <url>https://repository.apache.org/content/groups/snapshots/</url>
<layout>default</layout>
</repository>
<repository>
- <id>apache-snapshots</id>
- <url>https://repository.apache.org/content/groups/snapshots/</url>
+ <id>osgi-releases-and-snapshots</id>
+ <url>https://oss.sonatype.org/content/groups/osgi/</url>
<layout>default</layout>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>bnd-snapshots</id>
- <url>https://bndtools.ci.cloudbees.com/job/bnd.master/lastSuccessfulBuild/artifact/dist/bundles/</url>
- <layout>default</layout>
- </pluginRepository>
- </pluginRepositories>
</project>