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/04/27 21:49:47 UTC
svn commit: r1830402 - in /aries/trunk/cdi:
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/
cdi-extender/src/test/java/org/apache/aries/cdi/container...
Author: rotty3000
Date: Fri Apr 27 21:49:47 2018
New Revision: 1830402
URL: http://svn.apache.org/viewvc?rev=1830402&view=rev
Log:
[CDI] update to latest spec changes
Signed-off-by: Raymond Auge <ro...@apache.org>
Removed:
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceDescription.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceRanking.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ServiceVendor.java
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Maps.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/model/MapsTest.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java
aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/FooAnnotated.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java
aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java
aries/trunk/cdi/cdi-itests/itest.bndrun
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/IntegerServiceProvider.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/interfaces/BeanId.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
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/tb7/ConfigurationBeanF.java
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerBootstrap.java Fri Apr 27 21:49:47 2018
@@ -82,35 +82,35 @@ public class ContainerBootstrap extends
// Add the internal extensions
extensions.add(
- new ExtensionMetadata(
- new BundleContextExtension(containerState.bundleContext()),
- containerState.id()));
+ new ExtensionMetadata(
+ new BundleContextExtension(containerState.bundleContext()),
+ containerState.id()));
extensions.add(
- new ExtensionMetadata(
- new RuntimeExtension(containerState, _configurationBuilder, _singleBuilder, _factoryBuilder),
- containerState.id()));
+ new ExtensionMetadata(
+ new RuntimeExtension(containerState, _configurationBuilder, _singleBuilder, _factoryBuilder),
+ containerState.id()));
extensions.add(
- new ExtensionMetadata(
- new LoggerExtension(containerState),
- containerState.id()));
+ new ExtensionMetadata(
+ new LoggerExtension(containerState),
+ containerState.id()));
// Add extensions found from the bundle's class loader, such as those in the Bundle-ClassPath
ServiceLoader.load(Extension.class, containerState.classLoader()).forEach(extensions::add);
// Add external extensions
containerState.containerDTO().extensions.stream().map(
- ExtendedExtensionDTO.class::cast
- ).map(
- e -> new ExtensionMetadata(e.extension.getService(), e.template.serviceFilter)
- ).forEach(extensions::add);
+ ExtendedExtensionDTO.class::cast
+ ).map(
+ e -> new ExtensionMetadata(e.extension.getService(), e.template.serviceFilter)
+ ).forEach(extensions::add);
_bootstrap = new WeldBootstrap();
BeanDeploymentArchive beanDeploymentArchive = new ContainerDeploymentArchive(
- containerState.loader(),
- containerState.id(),
- containerState.beansModel().getBeanClassNames(),
- containerState.beansModel().getBeansXml());
+ containerState.loader(),
+ containerState.id(),
+ containerState.beansModel().getBeanClassNames(),
+ containerState.beansModel().getBeansXml());
Deployment deployment = new ContainerDeployment(extensions, beanDeploymentArchive);
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Maps.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Maps.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Maps.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/util/Maps.java Fri Apr 27 21:49:47 2018
@@ -36,7 +36,7 @@ import javax.enterprise.inject.spi.Annot
import javax.enterprise.inject.spi.AnnotatedParameter;
import javax.enterprise.inject.spi.AnnotatedType;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.util.converter.TypeReference;
public class Maps {
@@ -128,7 +128,7 @@ public class Maps {
public static Map<String, Object> merge(List<Annotation> annotations) {
return annotations.stream().filter(
- ann -> Objects.nonNull(ann.annotationType().getAnnotation(ComponentPropertyType.class))
+ ann -> Objects.nonNull(ann.annotationType().getAnnotation(BeanPropertyType.class))
).map(
ann -> Conversions.convert(ann).sourceAs(ann.annotationType()).to(new TypeReference<Map<String, Object>>() {})
).map(Map::entrySet).flatMap(Collection::stream).collect(
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/model/MapsTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/model/MapsTest.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/model/MapsTest.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/internal/model/MapsTest.java Fri Apr 27 21:49:47 2018
@@ -24,13 +24,13 @@ import java.util.stream.Stream;
import org.apache.aries.cdi.container.internal.util.Maps;
import org.junit.Assert;
import org.junit.Test;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Service;
public class MapsTest {
@Retention(RetentionPolicy.RUNTIME)
- @ComponentPropertyType
+ @BeanPropertyType
public @interface CPT1 {
String[] a();
int[] b();
@@ -38,19 +38,19 @@ public class MapsTest {
}
@Retention(RetentionPolicy.RUNTIME)
- @ComponentPropertyType
+ @BeanPropertyType
public @interface CPT2 {
String a();
int[] b();
}
@Retention(RetentionPolicy.RUNTIME)
- @ComponentPropertyType
+ @BeanPropertyType
public @interface CPT3 {
}
@Retention(RetentionPolicy.RUNTIME)
- @ComponentPropertyType
+ @BeanPropertyType
public @interface CPT4 {
String b();
}
Modified: aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java (original)
+++ aries/trunk/cdi/cdi-extender/src/test/java/org/apache/aries/cdi/container/test/beans/BarProducer.java Fri Apr 27 21:49:47 2018
@@ -20,10 +20,10 @@ import java.math.BigDecimal;
import javax.enterprise.inject.Produces;
-import org.apache.aries.cdi.extra.propertytypes.ServiceRanking;
import org.osgi.service.cdi.annotations.Reference;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.ServiceInstance;
+import org.osgi.service.cdi.propertytypes.ServiceRanking;
public class BarProducer {
@Produces
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=1830402&r1=1830401&r2=1830402&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 Apr 27 21:49:47 2018
@@ -17,9 +17,9 @@ package org.apache.aries.cdi.container.t
import javax.inject.Inject;
import javax.inject.Named;
-import org.apache.aries.cdi.extra.propertytypes.ServiceRanking;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
+import org.osgi.service.cdi.propertytypes.ServiceRanking;
import org.osgi.service.cdi.reference.BindObject;
@SingleComponent
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventDelivery.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
import org.osgi.service.event.annotations.RequireEventAdmin;
@@ -34,7 +34,7 @@ import org.osgi.service.event.annotation
* This annotation can be used on an {@link EventHandler} component to declare
* the value of the {@link EventConstants#EVENT_DELIVERY} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireEventAdmin
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventFilter.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
import org.osgi.service.event.annotations.RequireEventAdmin;
@@ -34,7 +34,7 @@ import org.osgi.service.event.annotation
* This annotation can be used on an {@link EventHandler} component to declare
* the value of the {@link EventConstants#EVENT_FILTER} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireEventAdmin
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/EventTopics.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.event.EventConstants;
import org.osgi.service.event.EventHandler;
import org.osgi.service.event.annotations.RequireEventAdmin;
@@ -34,7 +34,7 @@ import org.osgi.service.event.annotation
* This annotation can be used on an {@link EventHandler} component to declare
* the values of the {@link EventConstants#EVENT_TOPIC} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireEventAdmin
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/ExportedService.java Fri Apr 27 21:49:47 2018
@@ -23,7 +23,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.osgi.framework.Constants;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.FactoryComponent;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
@@ -36,7 +36,7 @@ import org.osgi.service.cdi.annotations.
* {@link FactoryComponent} or {@link Service} to declare the value of
* the remote service properties for an exported service.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface ExportedService {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContext.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -37,7 +37,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_CONTEXT_PATH
* HTTP_WHITEBOARD_CONTEXT_PATH} service properties.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardContextSelect.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the {@code osgi.http.whiteboard.context.select}
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_CONTEXT_SELECT
* HTTP_WHITEBOARD_CONTEXT_SELECT} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardContextSelect {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterAsyncSupported.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_FILTER_ASYNC_SUPPORTED
* HTTP_WHITEBOARD_FILTER_ASYNC_SUPPORTED} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterAsyncSupported {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterDispatcher.java Fri Apr 27 21:49:47 2018
@@ -24,7 +24,7 @@ import java.lang.annotation.Target;
import javax.servlet.DispatcherType;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the
@@ -35,7 +35,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_FILTER_DISPATCHER
* HTTP_WHITEBOARD_FILTER_DISPATCHER} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterDispatcher {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterName.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the {@code osgi.http.whiteboard.filter.name}
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_FILTER_NAME
* HTTP_WHITEBOARD_FILTER_NAME} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardFilterName {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterPattern.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_FILTER_PATTERN
* HTTP_WHITEBOARD_FILTER_PATTERN} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterRegex.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_FILTER_REGEX
* HTTP_WHITEBOARD_FILTER_REGEX} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardFilterServlet.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_FILTER_SERVLET
* HTTP_WHITEBOARD_FILTER_SERVLET} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardListener.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_LISTENER
* HTTP_WHITEBOARD_LISTENER} service property as being {@code Boolean.TRUE}.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardResource.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -35,7 +35,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_RESOURCE_PREFIX
* HTTP_WHITEBOARD_RESOURCE_PREFIX} service properties.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletAsyncSupported.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_SERVLET_ASYNC_SUPPORTED
* HTTP_WHITEBOARD_SERVLET_ASYNC_SUPPORTED} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardServletAsyncSupported {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletErrorPage.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_SERVLET_ERROR_PAGE
* HTTP_WHITEBOARD_SERVLET_ERROR_PAGE} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletMultipart.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the
@@ -46,7 +46,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_SERVLET_MULTIPART_MAXREQUESTSIZE
* HTTP_WHITEBOARD_SERVLET_MULTIPART_MAXREQUESTSIZE} service properties.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardServletMultipart {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletName.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_SERVLET_NAME
* HTTP_WHITEBOARD_SERVLET_NAME} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardServletPattern.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.http.whiteboard.annotations.RequireHttpWhiteboard;
/**
@@ -34,7 +34,7 @@ import org.osgi.service.http.whiteboard.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_SERVLET_PATTERN
* HTTP_WHITEBOARD_SERVLET_PATTERN} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireHttpWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/HttpWhiteboardTarget.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the {@code osgi.http.whiteboard.target} service
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.http.whiteboard.HttpWhiteboardConstants#HTTP_WHITEBOARD_TARGET
* HTTP_WHITEBOARD_TARGET} service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface HttpWhiteboardTarget {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JSONRequired.java Fri Apr 27 21:49:47 2018
@@ -27,7 +27,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import org.osgi.annotation.bundle.Requirement;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants;
import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
@@ -40,7 +40,7 @@ import org.osgi.service.jaxrs.whiteboard
* optional {@link Requirement} for a service providing this media type to aid
* with provisioning.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireJaxrsWhiteboard
@Requirement(
namespace = SERVICE_NAMESPACE, //
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationBase.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
/**
@@ -34,7 +34,7 @@ import org.osgi.service.jaxrs.whiteboard
* {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_APPLICATION_BASE}
* service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireJaxrsWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsApplicationSelect.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the {@code osgi.jaxrs.application.select} service
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_APPLICATION_SELECT}
* service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsApplicationSelect {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtension.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
/**
@@ -33,7 +33,7 @@ import org.osgi.service.jaxrs.whiteboard
* {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_EXTENSION}
* service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireJaxrsWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsExtensionSelect.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the {@code osgi.jaxrs.extension.select} service
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_EXTENSION_SELECT}
* service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsExtensionSelect {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsMediaType.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the {@code osgi.jaxrs.media.type} service
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_MEDIA_TYPE}
* service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsMediaType {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsName.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the {@code osgi.jaxrs.name} service property.
@@ -31,7 +31,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_NAME}
* service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsName {
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsResource.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.jaxrs.whiteboard.annotations.RequireJaxrsWhiteboard;
/**
@@ -32,7 +32,7 @@ import org.osgi.service.jaxrs.whiteboard
* {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_RESOURCE}
* service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@RequireJaxrsWhiteboard
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
Modified: aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java (original)
+++ aries/trunk/cdi/cdi-extra/src/main/java/org/apache/aries/cdi/extra/propertytypes/JaxrsWhiteboardTarget.java Fri Apr 27 21:49:47 2018
@@ -22,7 +22,7 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
/**
* Component Property Type for the {@code osgi.jaxrs.whiteboard.target} service
@@ -33,7 +33,7 @@ import org.osgi.service.cdi.annotations.
* {@link org.osgi.service.jaxrs.whiteboard.JaxrsWhiteboardConstants#JAX_RS_WHITEBOARD_TARGET}
* service property.
*/
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface JaxrsWhiteboardTarget {
Modified: aries/trunk/cdi/cdi-itests/itest.bndrun
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/itest.bndrun?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/itest.bndrun (original)
+++ aries/trunk/cdi/cdi-itests/itest.bndrun Fri Apr 27 21:49:47 2018
@@ -31,7 +31,6 @@
org.apache.aries.cdi.extender;version='[0.0.2,0.0.3)',\
org.apache.aries.cdi.extension.http;version='[0.0.2,0.0.3)',\
org.apache.aries.cdi.extension.jndi;version='[0.0.2,0.0.3)',\
- org.apache.aries.cdi.extra;version='[0.0.2,0.0.3)',\
org.apache.aries.cdi.itests;version='[0.0.2,0.0.3)',\
org.apache.aries.javax.annotation-api;version='[0.0.2,0.0.3)',\
org.apache.aries.javax.cdi-api;version='[0.0.2,0.0.3)',\
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/IntegerServiceProvider.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/IntegerServiceProvider.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/IntegerServiceProvider.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/beans/IntegerServiceProvider.java Fri Apr 27 21:49:47 2018
@@ -17,8 +17,8 @@ package org.apache.aries.cdi.test.beans;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
-import org.apache.aries.cdi.extra.propertytypes.ServiceRanking;
import org.osgi.service.cdi.annotations.Service;
+import org.osgi.service.cdi.propertytypes.ServiceRanking;
@ApplicationScoped
public class IntegerServiceProvider {
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=1830402&r1=1830401&r2=1830402&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 Apr 27 21:49:47 2018
@@ -26,7 +26,7 @@ import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.apache.aries.cdi.test.interfaces.Pojo;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
@@ -37,7 +37,7 @@ import org.osgi.service.cdi.annotations.
public class ServiceWithProperties implements BeanService<Pojo> {
@Retention(RUNTIME) @Target(TYPE)
- @ComponentPropertyType
+ @BeanPropertyType
public @interface Props {
String test_key_b1() default "test.value.b1";
String test_key_b2() default "test.value.b2";
@@ -62,7 +62,7 @@ public class ServiceWithProperties imple
}
@Retention(RUNTIME) @Target(TYPE )
- @ComponentPropertyType
+ @BeanPropertyType
public @interface MoreProperties {
String goo_string();
int glub_integer();
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/BeanId.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/BeanId.java?rev=1830402&r1=1830401&r2=1830402&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/BeanId.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/interfaces/BeanId.java Fri Apr 27 21:49:47 2018
@@ -20,9 +20,9 @@ import static java.lang.annotation.Reten
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
-@ComponentPropertyType
+@BeanPropertyType
@Retention(RUNTIME)
@Target({FIELD, METHOD, TYPE})
public @interface BeanId {
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=1830402&r1=1830401&r2=1830402&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 Apr 27 21:49:47 2018
@@ -25,7 +25,7 @@ import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.osgi.service.cdi.ConfigurationPolicy;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Configuration;
import org.osgi.service.cdi.annotations.PID;
import org.osgi.service.cdi.annotations.Service;
@@ -38,7 +38,7 @@ import org.osgi.service.cdi.annotations.
public class ConfigurationBeanA implements BeanService<Callable<int[]>> {
@Retention(RUNTIME) @Target(TYPE )
- @ComponentPropertyType
+ @BeanPropertyType
public @interface Props {
String bean() default "A";
}
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=1830402&r1=1830401&r2=1830402&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 Apr 27 21:49:47 2018
@@ -26,7 +26,7 @@ import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.BeanService;
import org.osgi.service.cdi.ConfigurationPolicy;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Configuration;
import org.osgi.service.cdi.annotations.PID;
import org.osgi.service.cdi.annotations.Service;
@@ -40,7 +40,7 @@ import org.osgi.service.cdi.annotations.
public class ConfigurationBeanB implements BeanService<Callable<int[]>> {
@Retention(RUNTIME) @Target(TYPE )
- @ComponentPropertyType
+ @BeanPropertyType
public @interface Props {
String bean() default "B";
}
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=1830402&r1=1830401&r2=1830402&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 Apr 27 21:49:47 2018
@@ -24,7 +24,7 @@ import java.util.concurrent.Callable;
import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.BeanService;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Configuration;
import org.osgi.service.cdi.annotations.PID;
import org.osgi.service.cdi.annotations.Service;
@@ -37,7 +37,7 @@ import org.osgi.service.cdi.annotations.
public class ConfigurationBeanC implements BeanService<Callable<int[]>> {
@Retention(RUNTIME) @Target(TYPE )
- @ComponentPropertyType
+ @BeanPropertyType
public @interface Props {
String bean() default "C";
}
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=1830402&r1=1830401&r2=1830402&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 Apr 27 21:49:47 2018
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
@@ -39,7 +39,7 @@ import org.osgi.service.cdi.annotations.
public class BarServlet extends HttpServlet {
@Retention(RUNTIME) @Target(TYPE )
- @ComponentPropertyType
+ @BeanPropertyType
public @interface Props {
String osgi_http_whiteboard_servlet_name() default "bar";
String osgi_http_whiteboard_servlet_pattern() default "/bar";
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=1830402&r1=1830401&r2=1830402&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 Apr 27 21:49:47 2018
@@ -29,7 +29,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Service;
import org.osgi.service.cdi.annotations.SingleComponent;
@@ -39,7 +39,7 @@ import org.osgi.service.cdi.annotations.
public class FooServlet extends HttpServlet {
@Retention(RUNTIME) @Target(TYPE )
- @ComponentPropertyType
+ @BeanPropertyType
public @interface Props {
String osgi_http_whiteboard_servlet_name() default "foo";
String osgi_http_whiteboard_servlet_pattern() default "/foo";
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=1830402&r1=1830401&r2=1830402&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 Fri Apr 27 21:49:47 2018
@@ -24,7 +24,7 @@ import java.util.concurrent.Callable;
import javax.inject.Inject;
import org.apache.aries.cdi.test.interfaces.BeanService;
-import org.osgi.service.cdi.annotations.ComponentPropertyType;
+import org.osgi.service.cdi.annotations.BeanPropertyType;
import org.osgi.service.cdi.annotations.Configuration;
import org.osgi.service.cdi.annotations.FactoryComponent;
import org.osgi.service.cdi.annotations.Service;
@@ -35,7 +35,7 @@ import org.osgi.service.cdi.annotations.
public class ConfigurationBeanF implements BeanService<Callable<int[]>> {
@Retention(RUNTIME) @Target(TYPE)
- @ComponentPropertyType
+ @BeanPropertyType
public @interface Props {
String bean() default "F";
}