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/08 14:10:41 UTC
svn commit: r1807764 - in /aries/trunk/cdi:
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/
cdi-extender/src/main/java/org/apache/aries/cdi/contai...
Author: rotty3000
Date: Fri Sep 8 14:10:41 2017
New Revision: 1807764
URL: http://svn.apache.org/viewvc?rev=1807764&view=rev
Log:
[CDI] use renamed scope attribute
Signed-off-by: Raymond Augé <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentDiscoveryExtension.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentProperties.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentRuntimeExtension.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/MarkedInjectionPoint.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/ComponentLiteral.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/reference/ReferenceBean.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ConstructorInjectedService.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedBundleScopedImpl.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedPrototypeScopedImpl.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/FieldInjectedService.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_Optional.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceProperties.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/Instance_ServiceReference.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/MethodInjectedService.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/ServiceWithProperties.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanA.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb3/ConfigurationBeanB.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/tb6/FooServlet.java
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentDiscoveryExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentDiscoveryExtension.java?rev=1807764&r1=1807763&r2=1807764&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentDiscoveryExtension.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentDiscoveryExtension.java Fri Sep 8 14:10:41 2017
@@ -88,7 +88,7 @@ public class ComponentDiscoveryExtension
).name(
component.name()
).scope(
- component.serviceScope()
+ component.scope()
);
for (String property : component.property()) {
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentProperties.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentProperties.java?rev=1807764&r1=1807763&r2=1807764&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentProperties.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentProperties.java Fri Sep 8 14:10:41 2017
@@ -54,6 +54,9 @@ public class ComponentProperties {
annotation).sourceAs(annotation.annotationType()).to(_mapType);
for (Map.Entry<String, Object> entry : map.entrySet()) {
+ if ('.' == entry.getKey().charAt(0)) {
+ continue;
+ }
componentProperties.put(entry.getKey(), entry.getValue());
}
@@ -61,6 +64,9 @@ public class ComponentProperties {
);
for (Map.Entry<String, Object> entry : Maps.map(_componentModel.getProperties()).entrySet()) {
+ if ('.' == entry.getKey().charAt(0)) {
+ continue;
+ }
componentProperties.put(entry.getKey(), entry.getValue());
}
@@ -80,6 +86,9 @@ public class ComponentProperties {
for (Enumeration<String> enumeration = properties.keys(); enumeration.hasMoreElements();) {
String key = enumeration.nextElement();
+ if ('.' == key.charAt(0)) {
+ continue;
+ }
componentProperties.put(key, properties.get(key));
}
}
@@ -94,11 +103,17 @@ public class ComponentProperties {
return this;
}
+ public ComponentProperties hidePrivate(boolean hidePrivate) {
+ _hidePrivate = hidePrivate;
+ return this;
+ }
+
private static final TypeReference<Map<String, Object>> _mapType = new TypeReference<Map<String, Object>>(){};
private Bean<?> _bean;
- private String[] _pid;
private ComponentModel _componentModel;
private ContainerState _containerState;
+ private String[] _pid;
+ private boolean _hidePrivate = false;
}
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentRuntimeExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentRuntimeExtension.java?rev=1807764&r1=1807763&r2=1807764&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentRuntimeExtension.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/ComponentRuntimeExtension.java Fri Sep 8 14:10:41 2017
@@ -295,9 +295,9 @@ public class ComponentRuntimeExtension i
// Only Dependent CDI scope is allowed for components who's service scope is singleton, bundle, prototype.
- if ((component.serviceScope() == ServiceScope.BUNDLE) ||
- (component.serviceScope() == ServiceScope.PROTOTYPE) ||
- (component.serviceScope() == ServiceScope.SINGLETON)) {
+ if ((component.scope() == ServiceScope.BUNDLE) ||
+ (component.scope() == ServiceScope.PROTOTYPE) ||
+ (component.scope() == ServiceScope.SINGLETON)) {
Class<?> scope = bean.getScope();
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/MarkedInjectionPoint.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/MarkedInjectionPoint.java?rev=1807764&r1=1807763&r2=1807764&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/MarkedInjectionPoint.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/component/MarkedInjectionPoint.java Fri Sep 8 14:10:41 2017
@@ -37,7 +37,7 @@ public class MarkedInjectionPoint extend
}
public InjectionPoint getDelegate() {
- return _delegate;
+ return delegate();
}
public int getMark() {
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/ComponentLiteral.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/ComponentLiteral.java?rev=1807764&r1=1807763&r2=1807764&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/ComponentLiteral.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/literal/ComponentLiteral.java Fri Sep 8 14:10:41 2017
@@ -67,7 +67,7 @@ public class ComponentLiteral extends An
}
@Override
- public ServiceScope serviceScope() {
+ public ServiceScope scope() {
return _scope;
}
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/reference/ReferenceBean.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/reference/ReferenceBean.java?rev=1807764&r1=1807763&r2=1807764&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/reference/ReferenceBean.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/reference/ReferenceBean.java Fri Sep 8 14:10:41 2017
@@ -127,31 +127,11 @@ public class ReferenceBean implements Be
}
private Object _getInjectedInstance() {
- Object instance = null;
-
Map<String, ReferenceCallback> map = _containerState.referenceCallbacks().get(_componentModel);
ReferenceCallback referenceCallback = map.get(_referenceModel.getName());
- switch (_referenceModel.getCollectionType()) {
- case PROPERTIES:
- instance = referenceCallback.tracked().values().iterator().next();
- break;
- case REFERENCE:
- instance = referenceCallback.tracked().values().iterator().next();
- break;
- case SERVICE:
- instance = referenceCallback.tracked().values().iterator().next();
- break;
- case SERVICEOBJECTS:
- instance = referenceCallback.tracked().values().iterator().next();
- break;
- case TUPLE:
- instance = referenceCallback.tracked().values().iterator().next();
- break;
- }
-
- return instance;
+ return referenceCallback.tracked().values().iterator().next();
}
private final BeanManager _beanManager;
@@ -161,4 +141,4 @@ public class ReferenceBean implements Be
private final String _name;
private final ReferenceModel _referenceModel;
-}
\ No newline at end of file
+}
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java?rev=1807764&r1=1807763&r2=1807764&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java Fri Sep 8 14:10:41 2017
@@ -21,7 +21,7 @@ import org.osgi.service.cdi.annotations.
name = "foo.annotated",
property = {"service.ranking:Integer=12"},
service = Foo.class,
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class FooAnnotated implements Foo, Cloneable {
}
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -23,7 +23,7 @@ import org.osgi.service.cdi.annotations.
@Component(
service = {ConstructorInjectedService.class, BeanService.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class ConstructorInjectedService implements BeanService<Pojo> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -30,7 +30,7 @@ import org.osgi.service.cdi.annotations.
@Component(
service = {FieldInjectedBundleScopedImpl.class, FieldInjectedReference.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class FieldInjectedBundleScopedImpl implements FieldInjectedReference<BundleScoped> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -30,7 +30,7 @@ import org.osgi.service.cdi.annotations.
@Component(
service = {FieldInjectedPrototypeScopedImpl.class, FieldInjectedReference.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class FieldInjectedPrototypeScopedImpl implements FieldInjectedReference<PrototypeScoped> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -23,7 +23,7 @@ import org.osgi.service.cdi.annotations.
@Component(
service = {FieldInjectedService.class, BeanService.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class FieldInjectedService implements BeanService<Pojo> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -28,7 +28,7 @@ import org.osgi.service.cdi.annotations.
@Component(
service = {BeanService.class, Instance_Optional.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class Instance_Optional implements BeanService<Callable<String>> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -30,7 +30,7 @@ import org.osgi.service.cdi.annotations.
@Component(
service = {BeanService.class, Instance_ServiceProperties.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class Instance_ServiceProperties implements BeanService<Map<String, Object>> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -29,7 +29,7 @@ import org.osgi.service.cdi.annotations.
@Component(
service = {BeanService.class, Instance_ServiceReference.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = 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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -23,7 +23,7 @@ import org.osgi.service.cdi.annotations.
@Component(
service = {MethodInjectedService.class, BeanService.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class MethodInjectedService implements BeanService<Pojo> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -142,7 +142,7 @@ import org.osgi.service.cdi.annotations.
"p.String.set:Set<String>=black"
},
service = {ServiceWithProperties.class, BeanService.class},
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.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/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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -26,7 +26,7 @@ import org.osgi.service.cdi.annotations.
@Component(
property = "bean=A",
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class ConfigurationBeanA implements BeanService<Callable<int[]>> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -27,7 +27,7 @@ import org.osgi.service.cdi.annotations.
@Component(
property = "bean=B",
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class ConfigurationBeanB implements BeanService<Callable<int[]>> {
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -24,7 +24,7 @@ import org.osgi.service.cdi.annotations.
import org.osgi.service.cdi.annotations.ConfigurationPolicy;
import org.osgi.service.cdi.annotations.ServiceScope;
-@Component(property = "bean=C", serviceScope = ServiceScope.SINGLETON)
+@Component(property = "bean=C", scope = ServiceScope.SINGLETON)
public class ConfigurationBeanC implements BeanService<Callable<int[]>> {
@Override
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=1807764&r1=1807763&r2=1807764&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 Fri Sep 8 14:10:41 2017
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN + "=/bar"
},
service = Servlet.class,
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class BarServlet extends HttpServlet {
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/FooServlet.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/FooServlet.java?rev=1807764&r1=1807763&r2=1807764&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/FooServlet.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb6/FooServlet.java Fri Sep 8 14:10:41 2017
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
HttpWhiteboardConstants.HTTP_WHITEBOARD_SERVLET_PATTERN + "=/foo"
},
service = Servlet.class,
- serviceScope = ServiceScope.SINGLETON
+ scope = ServiceScope.SINGLETON
)
public class FooServlet extends HttpServlet {