You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2015/02/13 01:57:52 UTC
cxf git commit: CXF-6221: CDI integration extension does not detect
annotations on Karaf. Added OSGi required metadata and Karaf feature
Repository: cxf
Updated Branches:
refs/heads/master 43babb8fc -> 0e6393990
CXF-6221: CDI integration extension does not detect annotations on Karaf. Added OSGi required metadata and Karaf feature
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0e639399
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0e639399
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0e639399
Branch: refs/heads/master
Commit: 0e639399027b2b43ece5b21f73effa6381a5bf0c
Parents: 43babb8
Author: reta <dr...@gmail.com>
Authored: Thu Feb 12 19:57:37 2015 -0500
Committer: reta <dr...@gmail.com>
Committed: Thu Feb 12 19:57:37 2015 -0500
----------------------------------------------------------------------
integration/cdi/pom.xml | 47 ++++++++++++++++++++
.../features/src/main/resources/features.xml | 5 +++
2 files changed, 52 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e639399/integration/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/integration/cdi/pom.xml b/integration/cdi/pom.xml
index 7d45355..dba90bc 100644
--- a/integration/cdi/pom.xml
+++ b/integration/cdi/pom.xml
@@ -30,11 +30,19 @@
<version>3.1.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
+
<properties>
<cxf.osgi.import>
javax.servlet*;version="${cxf.osgi.javax.servlet.version}",
+ javax.enterprise*;version="[${cxf.cdi.api.version},2)",
+ javax.ws.rs*;version="[1.0,3)",
+ org.apache.cxf*;version="${project.version}",
</cxf.osgi.import>
+ <cxf.osgi.export>
+ org.apache.cxf.jaxrs*
+ </cxf.osgi.export>
</properties>
+
<dependencies>
<dependency>
<groupId>javax.enterprise</groupId>
@@ -67,4 +75,43 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <!-- Generate Manifest file required for OSGI bundles -->
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${cxf.osgi.symbolic.name}</Bundle-SymbolicName>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Version>${cxf.osgi.version.clean}</Implementation-Version>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${cxf.osgi.version.clean}</Specification-Version>
+ <Bundle-DocURL>http://cxf.apache.org</Bundle-DocURL>
+ <Fragment-Host>${cxf.fragment.host}</Fragment-Host>
+ <_failok>true</_failok>
+ <_nouses>true</_nouses>
+ <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <Export-Package>${cxf.osgi.export}</Export-Package>
+ <Import-Package>
+ ${cxf.osgi.import}
+ </Import-Package>
+ <DynamicImport-Package>
+ ${cxf.osgi.dynamic.import}
+ </DynamicImport-Package>
+ <Require-Capability>
+ osgi.extender;filter:="(osgi.extender=pax.cdi)"
+ </Require-Capability>
+ <Provide-Capability>
+ org.ops4j.pax.cdi.extension; extension="cxf-integration-cdi"
+ </Provide-Capability>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/cxf/blob/0e639399/osgi/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/osgi/karaf/features/src/main/resources/features.xml b/osgi/karaf/features/src/main/resources/features.xml
index 8724f17..74ca7fa 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -415,4 +415,9 @@
<bundle start-level="35">mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-management-web/${project.version}</bundle>
</feature>
+
+ <feature name="cxf-jaxrs-cdi" version="${project.version}" resolver="(obr)">
+ <feature version="${project.version}">cxf-jaxrs</feature>
+ <bundle start-level="40">mvn:org.apache.cxf/cxf-integration-cdi/${project.version}</bundle>
+ </feature>
</features>