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/12/13 21:37:14 UTC
svn commit: r1848901 - in /aries/trunk/cdi: ./
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/
cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/
cdi-extender/src/main/java/org/apache/aries/cdi/container/i...
Author: rotty3000
Date: Thu Dec 13 21:37:14 2018
New Revision: 1848901
URL: http://svn.apache.org/viewvc?rev=1848901&view=rev
Log:
[CDI] add descriptive service properties and some cleanup
Signed-off-by: Raymond Auge <ro...@apache.org>
Modified:
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeploymentArchive.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerComponent.java
aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java
aries/trunk/cdi/cdi-extension-http/pom.xml
aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java
aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
aries/trunk/cdi/cdi-extension-jndi/pom.xml
aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java
aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java
aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3.java
aries/trunk/cdi/pom.xml
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/Activator.java Thu Dec 13 21:37:14 2018
@@ -114,8 +114,8 @@ public class Activator extends AbstractE
private void registerCCR() {
Dictionary<String, Object> properties = new Hashtable<>();
properties.put(Constants.SERVICE_CHANGECOUNT, _ccrChangeCount.get());
- properties.put(Constants.SERVICE_DESCRIPTION, "CDI Component Runtime");
- properties.put(Constants.SERVICE_VENDOR, "Apache Aries");
+ properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - CDI Component Runtime");
+ properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
ChangeObserverFactory changeObserverFactory = new ChangeObserverFactory();
@@ -129,6 +129,8 @@ public class Activator extends AbstractE
Dictionary<String, Object> properties = new Hashtable<>();
properties.put("osgi.command.scope", "cdi");
properties.put("osgi.command.function", new String[] {"list", "info"});
+ properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - Gogo Commands");
+ properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
_commandRegistration = _bundleContext.registerService(Object.class, _command, properties);
}
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ConfigurationListener.java Thu Dec 13 21:37:14 2018
@@ -30,6 +30,7 @@ import org.apache.aries.cdi.container.in
import org.apache.aries.cdi.container.internal.util.Syncro;
import org.apache.aries.cdi.container.internal.util.Throw;
import org.jboss.weld.exceptions.IllegalArgumentException;
+import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.cdi.ConfigurationPolicy;
import org.osgi.service.cdi.MaximumCardinality;
@@ -138,8 +139,11 @@ public class ConfigurationListener exten
Dictionary<String, Object> properties = new Hashtable<>();
properties.put("name", toString());
+ properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - Configuration Listener for " + containerState.bundle());
+ properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
+
_listenerService = containerState.bundleContext().registerService(
- org.osgi.service.cm.ConfigurationListener.class, this, properties);
+ org.osgi.service.cm.ConfigurationListener.class, this, properties);
return next.map(next -> (Component)next).map(
component -> {
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeploymentArchive.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeploymentArchive.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeploymentArchive.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ContainerDeploymentArchive.java Thu Dec 13 21:37:14 2018
@@ -21,6 +21,9 @@ import org.jboss.weld.bootstrap.api.Serv
import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;
import org.jboss.weld.bootstrap.spi.BeanDeploymentArchive;
import org.jboss.weld.bootstrap.spi.BeansXml;
+import org.jboss.weld.bootstrap.spi.EEModuleDescriptor;
+import org.jboss.weld.bootstrap.spi.EEModuleDescriptor.ModuleType;
+import org.jboss.weld.bootstrap.spi.helpers.EEModuleDescriptorImpl;
import org.jboss.weld.ejb.spi.EjbDescriptor;
import org.jboss.weld.resources.spi.ResourceLoader;
import org.jboss.weld.serialization.spi.ProxyServices;
@@ -39,6 +42,7 @@ public class ContainerDeploymentArchive
if (loader != null) {
_services.add(ResourceLoader.class, loader);
_services.add(ProxyServices.class, loader);
+ _services.add(EEModuleDescriptor.class, new EEModuleDescriptorImpl(id, ModuleType.WEB));
}
}
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/ReferenceSync.java Thu Dec 13 21:37:14 2018
@@ -127,7 +127,6 @@ public class ReferenceSync implements Se
boolean active = _componentInstanceDTO.active;
boolean resolved = (_referenceDTO.matches.size() >= _templateDTO.minimumCardinality);
boolean dynamic = (_templateDTO.policy == ReferencePolicy.DYNAMIC);
- boolean reluctant = (_templateDTO.policyOption == ReferencePolicyOption.RELUCTANT);
CollectionType collectionType = _templateDTO.collectionType;
boolean requiresUpdate = true;
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/container/RuntimeExtension.java Thu Dec 13 21:37:14 2018
@@ -62,6 +62,7 @@ import org.apache.aries.cdi.container.in
import org.apache.aries.cdi.container.internal.model.SingleComponent;
import org.apache.aries.cdi.container.internal.util.SRs;
import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
import org.osgi.framework.PrototypeServiceFactory;
import org.osgi.framework.ServiceFactory;
import org.osgi.framework.ServiceRegistration;
@@ -138,6 +139,8 @@ public class RuntimeExtension implements
).then(s -> {
Dictionary<String, Object> properties = new Hashtable<>();
properties.put(CDIConstants.CDI_CONTAINER_ID, _containerState.id());
+ properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - BeanManager for " + _containerState.bundle());
+ properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
registerService(
new String[] {BeanManager.class.getName()}, bm,
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerComponent.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerComponent.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerComponent.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/ContainerComponent.java Thu Dec 13 21:37:14 2018
@@ -114,7 +114,7 @@ public class ContainerComponent extends
containerState.containerDTO().components.add(_snapshot);
ExtendedComponentInstanceDTO instanceDTO = new ExtendedComponentInstanceDTO(
- containerState, _activatorBuilder);
+ containerState, _activatorBuilder);
instanceDTO.activations = new CopyOnWriteArrayList<>();
instanceDTO.configurations = new CopyOnWriteArrayList<>();
@@ -124,10 +124,10 @@ public class ContainerComponent extends
_snapshot.instances.add(instanceDTO);
submit(instanceDTO.openOp(), instanceDTO::open).onFailure(
- f -> {
- _log.error(l -> l.error("CCR Error in container component open for {} on {}", _template.name, containerState.bundle()));
- }
- );
+ f -> {
+ _log.error(l -> l.error("CCR Error in container component open for {} on {}", _template.name, containerState.bundle()));
+ }
+ );
return true;
}
Modified: aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java (original)
+++ aries/trunk/cdi/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/model/SingleActivator.java Thu Dec 13 21:37:14 2018
@@ -128,7 +128,6 @@ public class SingleActivator extends Ins
}
);
-
ExtendedComponentTemplateDTO extended = (ExtendedComponentTemplateDTO)_instance.template;
Set<Bean<?>> beans = beanManager.getBeans(
Modified: aries/trunk/cdi/cdi-extension-http/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/pom.xml?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/pom.xml (original)
+++ aries/trunk/cdi/cdi-extension-http/pom.xml Thu Dec 13 21:37:14 2018
@@ -62,6 +62,11 @@
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.el</artifactId>
<version>3.0.1-b05</version>
Modified: aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java (original)
+++ aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpActivator.java Thu Dec 13 21:37:14 2018
@@ -82,6 +82,9 @@ public class HttpActivator implements Bu
public void start(BundleContext context) throws Exception {
Dictionary<String, Object> properties = new Hashtable<>();
properties.put(CDIConstants.CDI_EXTENSION_PROPERTY, "aries.cdi.http");
+ properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - HTTP Portable Extension Factory");
+ properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
+
_serviceRegistration = context.registerService(
Extension.class, new HttpExtensionFactory(), properties);
}
Modified: aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java (original)
+++ aries/trunk/cdi/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java Thu Dec 13 21:37:14 2018
@@ -62,8 +62,9 @@ public class HttpExtension implements Ex
Dictionary<String, Object> properties = new Hashtable<>();
- properties.put(
- HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, getSelectedContext());
+ properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - HTTP Portable Extension");
+ properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
+ properties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT, getSelectedContext());
properties.put(HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER, Boolean.TRUE.toString());
properties.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE - 100);
@@ -76,6 +77,9 @@ public class HttpExtension implements Ex
_listenerRegistration = _bundle.getBundleContext().registerService(
LISTENER_CLASSES, initialListener, properties);
+ properties.put(
+ Constants.SERVICE_DESCRIPTION, "Aries CDI - ELResolver Servlet Context Listener");
+
_elAdaptorRegistration = _bundle.getBundleContext().registerService(
ServletContextListener.class,
new ServletContextListener() {
Modified: aries/trunk/cdi/cdi-extension-jndi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/pom.xml?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/pom.xml (original)
+++ aries/trunk/cdi/cdi-extension-jndi/pom.xml Thu Dec 13 21:37:14 2018
@@ -42,6 +42,16 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_2.0_spec</artifactId>
<version>1.1</version>
</dependency>
Modified: aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java (original)
+++ aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiActivator.java Thu Dec 13 21:37:14 2018
@@ -79,6 +79,8 @@ public class JndiActivator implements Bu
Dictionary<String, Object> properties = new Hashtable<>();
properties.put(CDIConstants.CDI_EXTENSION_PROPERTY, "aries.cdi.jndi");
properties.put(JNDIConstants.JNDI_URLSCHEME, "java");
+ properties.put(Constants.SERVICE_DESCRIPTION, "Aries CDI - JNDI Portable Extension Factory");
+ properties.put(Constants.SERVICE_VENDOR, "Apache Software Foundation");
_serviceRegistration = context.registerService(
new String[] {Extension.class.getName(), ObjectFactory.class.getName()},
Modified: aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java (original)
+++ aries/trunk/cdi/cdi-extension-jndi/src/main/java/org/apache/aries/cdi/extension/jndi/JndiExtension.java Thu Dec 13 21:37:14 2018
@@ -16,9 +16,9 @@ package org.apache.aries.cdi.extension.j
import java.util.Hashtable;
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.context.Initialized;
+import javax.annotation.Priority;
import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.Extension;
import javax.naming.Name;
@@ -46,8 +46,11 @@ public class JndiExtension implements Ex
return null;
}
- void applicationScopedInitialized(@Observes @Initialized(ApplicationScoped.class) Object o, BeanManager bm) {
- _beanManager.resolve(bm);
+ void applicationScopedInitialized(
+ @Observes @Priority(javax.interceptor.Interceptor.Priority.LIBRARY_AFTER+800)
+ AfterDeploymentValidation adv, BeanManager beanManager) {
+
+ _beanManager.resolve(beanManager);
}
private final Deferred<BeanManager> _beanManager;
Modified: aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3.java
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3.java?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3.java (original)
+++ aries/trunk/cdi/cdi-itests/src/main/java/org/apache/aries/cdi/test/cases/Test152_3.java Thu Dec 13 21:37:14 2018
@@ -14,7 +14,7 @@
package org.apache.aries.cdi.test.cases;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
import javax.enterprise.context.spi.Context;
@@ -62,6 +62,7 @@ public class Test152_3 extends AbstractT
twoTracker.waitForService(timeout);
assertThat(service).isNotNull();
+ @SuppressWarnings("unchecked")
BeanService<Context> bs = (BeanService<Context>)service;
Context context = bs.get();
assertThat(context).isNotNull();
Modified: aries/trunk/cdi/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/cdi/pom.xml?rev=1848901&r1=1848900&r2=1848901&view=diff
==============================================================================
--- aries/trunk/cdi/pom.xml (original)
+++ aries/trunk/cdi/pom.xml Thu Dec 13 21:37:14 2018
@@ -193,6 +193,31 @@
</archive>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore>
+ </ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>