Repository: cxf Updated Branches: refs/heads/master 23c0c7309 -> 03d63bca6
[CXF-6442] Switch cxf-http to use the http feature Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/03d63bca Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/03d63bca Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/03d63bca Branch: refs/heads/master Commit: 03d63bca6fd9497ddeba1a0657929150d02827d2 Parents: 23c0c73 Author: Christian Schneider <[email protected]> Authored: Fri Jun 5 15:23:57 2015 +0200 Committer: Christian Schneider <[email protected]> Committed: Fri Jun 5 15:24:36 2015 +0200 ---------------------------------------------------------------------- osgi/karaf/features/src/main/resources/features.xml | 9 ++++++++- services/xkms/README.txt | 5 ++++- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/03d63bca/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 8f132ce..2cd334e 100644 --- a/osgi/karaf/features/src/main/resources/features.xml +++ b/osgi/karaf/features/src/main/resources/features.xml @@ -132,11 +132,18 @@ <feature version="${cxf.wss4j.version}">wss4j</feature> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-security-saml/${project.version}</bundle> </feature> - <feature name="cxf-http" version="${project.version}" resolver="(obr)"> + <feature name="cxf-http-client" version="${project.version}" resolver="(obr)"> + <!-- Can be used instead cxf-http for a smaller footprint --> <feature version="${project.version}">cxf-core</feature> <bundle start-level="40">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle> <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle> </feature> + + <feature name="cxf-http" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">cxf-core</feature> + <feature>http</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle> + </feature> <feature name="cxf-http-jetty" version="${project.version}" resolver="(obr)"> <feature version="[3,4)">cxf-http</feature> <feature version="[7,10)">jetty</feature> http://git-wip-us.apache.org/repos/asf/cxf/blob/03d63bca/services/xkms/README.txt ---------------------------------------------------------------------- diff --git a/services/xkms/README.txt b/services/xkms/README.txt index 3764b15..932241c 100644 --- a/services/xkms/README.txt +++ b/services/xkms/README.txt @@ -15,5 +15,8 @@ xkms-war - Web spring configuration for Web depoyment Installation ------------ -features:addurl mvn:org.apache.cxf.services.xkms/cxf-services-xkms-features/3.0.0-SNAPSHOT/xml +features:addurl mvn:org.apache.cxf.services.xkms/cxf-services-xkms-features/3.1.1-SNAPSHOT/xml features:install cxf-xkms-service cxf-xkms-client + +feature:repo-add mvn:org.apache.cxf.services.xkms/cxf-services-xkms-features/3.1.1-SNAPSHOT/xml +feature:install cxf-xkms-service cxf-xkms-client
