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 2019/11/21 03:48:15 UTC
[aries-cdi] branch rotty3000/eliminate-double-start updated
(7b7cf18 -> d1e448d)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch rotty3000/eliminate-double-start
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git.
from 7b7cf18 an initial patch to use OWB
new a863690 tweaks to eliminate some errors in slf4j binding
new 3dd498c handle ISE during shutdown
new d1e448d temporary fix for bug in OWB (doesn't appear to properly handle Annotation as proxyable type)
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
cdi-bom/pom.xml | 6 ++++++
cdi-executable/executable.bndrun | 17 +++++++++--------
.../internal/bean/ComponentPropertiesBean.java | 4 ++--
.../aries/cdi/extension/http/HttpExtension.java | 20 +++++++++++---------
cdi-itests/itest.bndrun | 19 ++++++++++---------
5 files changed, 38 insertions(+), 28 deletions(-)
[aries-cdi] 03/03: temporary fix for bug in OWB (doesn't appear to
properly handle Annotation as proxyable type)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch rotty3000/eliminate-double-start
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
View the commit online:
https://github.com/apache/aries-cdi/commit/d1e448d287802c2a449875c1e68d1bca6ee4c793
commit d1e448d287802c2a449875c1e68d1bca6ee4c793
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Wed Nov 20 22:47:31 2019 -0500
temporary fix for bug in OWB (doesn't appear to properly handle Annotation as proxyable type)
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../aries/cdi/container/internal/bean/ComponentPropertiesBean.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java
index 8155ac9..db9d8d5 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/internal/bean/ComponentPropertiesBean.java
@@ -21,7 +21,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.Bean;
@@ -98,7 +98,7 @@ public class ComponentPropertiesBean implements Bean<Object> {
ExtendedActivationDTO current = ComponentContext.With.current();
if (current == null) {
- return ApplicationScoped.class;
+ return Dependent.class;
}
return ComponentScoped.class;
[aries-cdi] 01/03: tweaks to eliminate some errors in slf4j binding
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch rotty3000/eliminate-double-start
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
View the commit online:
https://github.com/apache/aries-cdi/commit/a863690a0eeec4fc0ac026f32e8ce74a950a61ec
commit a863690a0eeec4fc0ac026f32e8ce74a950a61ec
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Wed Nov 20 22:46:15 2019 -0500
tweaks to eliminate some errors in slf4j binding
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-bom/pom.xml | 6 ++++++
cdi-executable/executable.bndrun | 17 +++++++++--------
cdi-itests/itest.bndrun | 19 ++++++++++---------
3 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/cdi-bom/pom.xml b/cdi-bom/pom.xml
index 646b754..87051a6 100644
--- a/cdi-bom/pom.xml
+++ b/cdi-bom/pom.xml
@@ -128,6 +128,12 @@
<artifactId>xbean-bundleutils</artifactId>
<version>4.15</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/cdi-executable/executable.bndrun b/cdi-executable/executable.bndrun
index 9f5200b..93a3685 100644
--- a/cdi-executable/executable.bndrun
+++ b/cdi-executable/executable.bndrun
@@ -39,13 +39,18 @@
-runsystempackages: \
org.slf4j;version=1.7.28,\
+ org.slf4j.event;version=1.7.25,\
org.slf4j.helpers;version=1.7.28,\
org.slf4j.spi;version=1.7.28,\
sun.misc
-runbundles: \
javax.ejb-api;version='[3.2.0,3.2.1)',\
+ javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
javax.transaction-api;version='[1.2.0,1.2.1)',\
+ openwebbeans-impl;version='[2.0.13,2.0.14)',\
+ openwebbeans-spi;version='[2.0.13,2.0.14)',\
+ openwebbeans-web;version='[2.0.13,2.0.14)',\
org.apache.aries.cdi.extender;version='[1.0.3,1.0.4)',\
org.apache.aries.cdi.extension.http;version='[1.0.3,1.0.4)',\
org.apache.aries.cdi.extra;version='[1.0.3,1.0.4)',\
@@ -54,20 +59,16 @@
org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
- org.apache.felix.http.jetty;version='[4.0.6,4.0.7)',\
+ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
+ org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
+ org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
org.osgi.util.promise;version='[1.1.0,1.1.1)',\
- javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
- openwebbeans-impl;version='[2.0.13,2.0.14)',\
- openwebbeans-spi;version='[2.0.13,2.0.14)',\
- openwebbeans-web;version='[2.0.13,2.0.14)',\
- org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
- org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)'
\ No newline at end of file
diff --git a/cdi-itests/itest.bndrun b/cdi-itests/itest.bndrun
index a11fc78..6e71cb6 100644
--- a/cdi-itests/itest.bndrun
+++ b/cdi-itests/itest.bndrun
@@ -37,12 +37,17 @@
-runsystempackages: \
org.slf4j;version=1.7.25,\
+ org.slf4j.event;version=1.7.25,\
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.misc
-runbundles: \
biz.aQute.junit;version='[4.3.1,4.3.2)',\
+ javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
+ openwebbeans-impl;version='[2.0.13,2.0.14)',\
+ openwebbeans-spi;version='[2.0.13,2.0.14)',\
+ openwebbeans-web;version='[2.0.13,2.0.14)',\
org.apache.aries.cdi.extender;version='[1.0.3,1.0.4)',\
org.apache.aries.cdi.extension.http;version='[1.0.3,1.0.4)',\
org.apache.aries.cdi.extension.jndi;version='[1.0.3,1.0.4)',\
@@ -57,7 +62,7 @@
org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
- org.apache.felix.http.jetty;version='[4.0.6,4.0.7)',\
+ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
@@ -66,13 +71,9 @@
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
- org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
- org.osgi.util.function;version='[1.1.0,1.1.1)',\
- org.osgi.util.promise;version='[1.1.0,1.1.1)',\
- javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
- openwebbeans-spi;version='[2.0.13,2.0.14)',\
- openwebbeans-impl;version='[2.0.13,2.0.14)',\
- openwebbeans-web;version='[2.0.13,2.0.14)',\
org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
- org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)'
\ No newline at end of file
+ org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
+ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
[aries-cdi] 02/03: handle ISE during shutdown
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch rotty3000/eliminate-double-start
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
View the commit online:
https://github.com/apache/aries-cdi/commit/3dd498c432af5916a0836a149b731817d2a231da
commit 3dd498c432af5916a0836a149b731817d2a231da
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Wed Nov 20 22:46:44 2019 -0500
handle ISE during shutdown
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../aries/cdi/extension/http/HttpExtension.java | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java b/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
index 2506dcb..d9ba270 100644
--- a/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
+++ b/cdi-extension-http/src/main/java/org/apache/aries/cdi/extension/http/HttpExtension.java
@@ -14,14 +14,11 @@
package org.apache.aries.cdi.extension.http;
-import static javax.interceptor.Interceptor.Priority.LIBRARY_AFTER;
-import static org.osgi.framework.Constants.SERVICE_DESCRIPTION;
-import static org.osgi.framework.Constants.SERVICE_RANKING;
-import static org.osgi.framework.Constants.SERVICE_VENDOR;
-import static org.osgi.namespace.extender.ExtenderNamespace.EXTENDER_NAMESPACE;
-import static org.osgi.service.cdi.CDIConstants.CDI_CAPABILITY_NAME;
-import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT;
-import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.HTTP_WHITEBOARD_LISTENER;
+import static javax.interceptor.Interceptor.Priority.*;
+import static org.osgi.framework.Constants.*;
+import static org.osgi.namespace.extender.ExtenderNamespace.*;
+import static org.osgi.service.cdi.CDIConstants.*;
+import static org.osgi.service.http.whiteboard.HttpWhiteboardConstants.*;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
@@ -259,7 +256,12 @@ public class HttpExtension implements Extension {
void beforeShutdown(@Observes BeforeShutdown bs) {
if (_listenerRegistration != null && !destroyed.get()) {
- _listenerRegistration.unregister();
+ try {
+ _listenerRegistration.unregister();
+ }
+ catch (IllegalStateException ise) {
+ // the service was already unregistered.
+ }
}
}