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/20 19:15:14 UTC
[aries-cdi] 03/03: let bnd generate service loader descriptor
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
View the commit online:
https://github.com/apache/aries-cdi/commit/e397a826d387158fec95ed9a0da863a5ae6551b8
commit e397a826d387158fec95ed9a0da863a5ae6551b8
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Wed Nov 20 14:06:52 2019 -0500
let bnd generate service loader descriptor
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../java/org/apache/aries/cdi/container/package-info.java | 2 ++
.../javax.enterprise.inject.se.SeContainerInitializer | 13 -------------
.../services/javax.enterprise.inject.spi.CDIProvider | 13 -------------
3 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java b/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java
index 4c7766e..fbc8be2 100644
--- a/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java
+++ b/cdi-extender/src/main/java/org/apache/aries/cdi/container/package-info.java
@@ -60,6 +60,7 @@
}
)
@Capability(
+ attribute = "register:=javax.enterprise.inject.se.SeContainerInitializer",
namespace = "osgi.serviceloader",
name = "javax.enterprise.inject.se.SeContainerInitializer",
uses = {
@@ -68,6 +69,7 @@
}
)
@Capability(
+ attribute = "register:=javax.enterprise.inject.spi.CDIProvider",
namespace = "osgi.serviceloader",
name = "javax.enterprise.inject.spi.CDIProvider",
uses = {
diff --git a/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer b/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
deleted file mode 100644
index 01119f8..0000000
--- a/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.se.SeContainerInitializer
+++ /dev/null
@@ -1,13 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.aries.cdi.container.internal.provider.SeContainerInitializer
\ No newline at end of file
diff --git a/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider b/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider
deleted file mode 100644
index 77348d0..0000000
--- a/cdi-extender/src/main/resources/META-INF/services/javax.enterprise.inject.spi.CDIProvider
+++ /dev/null
@@ -1,13 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-org.apache.aries.cdi.container.internal.provider.CDIProvider
\ No newline at end of file