Repository: cxf Updated Branches: refs/heads/master 56dab42ca -> 042d1dbe5
http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/osgi/karaf4/features/src/main/resources/features.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf4/features/src/main/resources/features.xml b/osgi/karaf4/features/src/main/resources/features.xml new file mode 100644 index 0000000..5814db2 --- /dev/null +++ b/osgi/karaf4/features/src/main/resources/features.xml @@ -0,0 +1,517 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. +--> +<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0"; name="cxf-${project.version}"> + + <repository>mvn:org.ops4j.pax.web/pax-web-features/6.0.0-SNAPSHOT/xml/features</repository> + <repository>mvn:org.ops4j.pax.cdi/pax-cdi-features/[1.0.0.RC1,2)/xml/features</repository> + <repository>mvn:org.apache.activemq/activemq-karaf/[5.4,6)/xml/features</repository> + + <feature name="cxf-specs" version="${project.version}"> + <bundle start-level="9">mvn:org.apache.geronimo.specs/geronimo-osgi-registry/1.1</bundle> + <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="10">mvn:javax.annotation/javax.annotation-api/${cxf.javax.annotation-api.version}</bundle> + <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="10" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="10">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jsr339-api-2.0.1/${cxf.servicemix.specs.version.jaxrs}</bundle> + <bundle start-level="10" dependency="true">mvn:javax.mail/mail/${cxf.javax.mail.version}</bundle> + <bundle start-level="20">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle> + <bundle start-level="20">mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle> + <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle> + <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle> + </feature> + <feature name="cxf-jaxb" version="${project.version}"> + <feature version="${project.version}">cxf-specs</feature> + <feature version="${project.version}">cxf-wsdl</feature> + <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-impl/${cxf.jaxb.bundle.version}</bundle> + <bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle> + </feature> + <!-- Current the abdera bundle is not working as we expect --> + <feature name="cxf-abdera" version="${project.version}"> + <feature version="${project.version}">cxf-specs</feature> + <bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle> + <bundle start-level="35">mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle> + <bundle start-level="35">mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle> + <bundle start-level="35">mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle> + <bundle start-level="35">mvn:org.apache.james/apache-mime4j-core/${cxf.james.mim4j.version}</bundle> + <bundle start-level="35">mvn:org.apache.abdera/abdera-parser/${cxf.abdera.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${cxf.dom4j.bundle.version}</bundle> + <!--bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle> + <bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>--> + </feature> + <feature name="wss4j" version="${cxf.wss4j.version}"> + <feature version="${project.version}">cxf-specs</feature> + <bundle start-level="25" dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle> + <bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle> + <bundle start-level="25" dependency="true">mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version}</bundle> + <bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.guava.version}</bundle> + <bundle start-level="25" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.opensaml/${cxf.opensaml.osgi.version}</bundle> + <bundle start-level="25">mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}</bundle> + <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saaj-impl/${cxf.saaj-impl.bundle.version}</bundle> + <bundle start-level="25">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${cxf.xerces.bundle.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${cxf.bcel.bundle.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${cxf.xalan.bundle.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jasypt/${cxf.jasypt.bundle.version}</bundle> + <bundle start-level="30">mvn:org.apache.wss4j/wss4j-bindings/${cxf.wss4j.version}</bundle> + <bundle start-level="30">mvn:org.apache.wss4j/wss4j-ws-security-common/${cxf.wss4j.version}</bundle> + <bundle start-level="30">mvn:org.apache.wss4j/wss4j-ws-security-dom/${cxf.wss4j.version}</bundle> + <bundle start-level="30">mvn:org.apache.wss4j/wss4j-policy/${cxf.wss4j.version}</bundle> + <bundle start-level="30">mvn:org.apache.wss4j/wss4j-ws-security-stax/${cxf.wss4j.version}</bundle> + <bundle start-level="30">mvn:org.apache.wss4j/wss4j-ws-security-policy-stax/${cxf.wss4j.version}</bundle> + </feature> + <feature name="cxf-core" version="${project.version}"> + <feature version="${project.version}">cxf-specs</feature> + <bundle start-level="30" dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${cxf.xmlschema.version}</bundle> + <bundle start-level="25" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${cxf.xmlresolver.bundle.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fastinfoset/${cxf.fastinfoset.bundle.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-core/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-management/${project.version}</bundle> + <conditional> + <condition>shell</condition> + <feature version="${project.version}">cxf-commands</feature> + </conditional> + </feature> + <feature name="cxf-commands" version="${project.version}"> + <feature>shell</feature> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40">mvn:org.apache.cxf.karaf4/cxf-karaf4-commands/${project.version}</bundle> + </feature> + <feature name="cxf-wsdl" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${cxf.wsdl4j.bundle.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-wsdl/${project.version}</bundle> + </feature> + <feature name="cxf-ws-policy" version="${project.version}"> + <feature version="${project.version}">cxf-wsdl</feature> + <bundle start-level="30" dependency="true">mvn:org.apache.neethi/neethi/${cxf.neethi.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-policy/${project.version}</bundle> + </feature> + <feature name="cxf-ws-addr" version="${project.version}"> + <feature version="${project.version}">cxf-ws-policy</feature> + <feature version="${project.version}">cxf-bindings-soap</feature> + <feature version="${project.version}">cxf-databinding-jaxb</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-addr/${project.version}</bundle> + </feature> + <feature name="cxf-ws-rm" version="${project.version}"> + <feature version="${project.version}">cxf-ws-policy</feature> + <feature version="${project.version}">cxf-ws-addr</feature> + <feature version="${project.version}">cxf-ws-security</feature> + <feature version="${project.version}">cxf-databinding-jaxb</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-rm/${project.version}</bundle> + </feature> + <feature name="cxf-ws-mex" version="${project.version}"> + <feature version="${project.version}">cxf-ws-policy</feature> + <feature version="${project.version}">cxf-ws-addr</feature> + <feature version="${project.version}">cxf-jaxws</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-mex/${project.version}</bundle> + </feature> + <feature name="cxf-ws-security" version="${project.version}"> + <feature version="${cxf.wss4j.version}">wss4j</feature> + <feature version="${project.version}">cxf-rt-security-saml</feature> + <feature version="${project.version}">cxf-ws-policy</feature> + <feature version="${project.version}">cxf-ws-addr</feature> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle> + <bundle start-level="40" dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-ws-security/${project.version}</bundle> + </feature> + <feature name="cxf-rt-security" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-wsdl</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-security/${project.version}</bundle> + </feature> + <feature name="cxf-rt-security-saml" version="${project.version}"> + <feature version="${project.version}">cxf-rt-security</feature> + <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-client" version="${project.version}"> + <!-- 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}"> + <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}"> + <feature version="${project.version}">cxf-http</feature> + <feature version="[7,10)">jetty</feature> + <feature>aries-blueprint</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle> + </feature> + <feature name="cxf-http-async" version="${project.version}"> + <feature version="${project.version}">cxf-http</feature> + <bundle start-level="40">mvn:org.apache.httpcomponents/httpcore-osgi/${cxf.httpcomponents.core.version}</bundle> + <bundle start-level="40">mvn:org.apache.httpcomponents/httpclient-osgi/${cxf.httpcomponents.client.version}</bundle> + <bundle start-level="40">mvn:org.apache.httpcomponents/httpasyncclient-osgi/${cxf.httpcomponents.asyncclient.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-hc/${project.version}</bundle> + </feature> + <feature name="cxf-http-netty-client" version="${project.version}"> + <feature version="${project.version}">cxf-http</feature> + <bundle dependency="true" start-level="40">mvn:${cxf.servlet-api.group}/${cxf.servlet-api.artifact}/${cxf.servlet-api.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-common/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-handler/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-buffer/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-transport/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-codec/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-codec-http/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-netty-client/${project.version}</bundle> + </feature> + <feature name="cxf-http-netty-server" version="${project.version}"> + <feature version="${project.version}">cxf-http</feature> + <bundle start-level="40">mvn:io.netty/netty-common/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-handler/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-buffer/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-transport/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-codec/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:io.netty/netty-codec-http/${cxf.netty.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-netty-server/${project.version}</bundle> + </feature> + <feature name="cxf-http-undertow" version="${project.version}"> + <feature version="${project.version}">cxf-http</feature> + <feature>pax-http-undertow</feature> + <feature>aries-blueprint</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http-undertow/${project.version}</bundle> + </feature> + <feature name="cxf-bindings-soap" version="${project.version}"> + <feature version="${project.version}">cxf-wsdl</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-xml/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-soap/${project.version}</bundle> + </feature> + <feature name="cxf-jaxws" version="${project.version}"> + <feature version="${project.version}">cxf-wsdl</feature> + <feature version="${project.version}">cxf-databinding-jaxb</feature> + <feature version="${project.version}">cxf-bindings-soap</feature> + <feature version="${project.version}">cxf-http</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-simple/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-jaxws/${project.version}</bundle> + </feature> + <feature name="cxf-jaxrs" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-http</feature> + <bundle start-level="30" dependency="true">mvn:org.codehaus.jettison/jettison/${cxf.jettison.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-extension-providers/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-extension-search/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-jaxrs/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-client/${project.version}</bundle> + </feature> + <feature name="cxf-rs-security-xml" version="${project.version}"> + <feature version="${project.version}">cxf-jaxrs</feature> + <feature version="${project.version}">cxf-rt-security-saml</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-xml/${project.version}</bundle> + </feature> + <feature name="cxf-rs-security-sso-saml" version="${project.version}"> + <feature version="${project.version}">cxf-rs-security-xml</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-sso-saml/${project.version}</bundle> + </feature> + <feature name="cxf-rs-security-cors" version="${project.version}"> + <feature version="${project.version}">cxf-jaxrs</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-cors/${project.version}</bundle> + </feature> + <feature name="cxf-rs-security-oauth" version="${project.version}"> + <feature version="${project.version}">cxf-jaxrs</feature> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oauth-provider/${cxf.oauth.bundle.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-oauth/${project.version}</bundle> + </feature> + <feature name="cxf-rs-security-jose" version="${project.version}"> + <feature version="${project.version}">cxf-jaxrs</feature> + <feature version="${project.version}">cxf-rt-security</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-json-basic/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-jose/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-jose-jaxrs/${project.version}</bundle> + </feature> + <feature name="cxf-rs-security-oauth2" version="${project.version}"> + <feature version="${project.version}">cxf-rs-security-jose</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-oauth2/${project.version}</bundle> + </feature> + <feature name="cxf-rs-description-swagger2" version="${project.version}"> + <feature version="${project.version}">cxf-jaxrs</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-service-description-swagger/${project.version}</bundle> + <bundle start-level="10" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle> + <bundle start-level="35" dependency="true">mvn:org.apache.commons/commons-lang3/${cxf.commons-lang3.version}</bundle> + <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${cxf.jackson.version}</bundle> + <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${cxf.jackson.version}</bundle> + <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${cxf.jackson.version}</bundle> + <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${cxf.jackson.version}</bundle> + <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${cxf.jackson.version}</bundle> + <bundle start-level="35" dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${cxf.jackson.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.javassist/javassist/${cxf.javassist.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${cxf.reflections.bundle.version}</bundle> + <bundle start-level="25" dependency="true">mvn:com.google.guava/guava/${cxf.guava.version}</bundle> + <bundle start-level="35" dependency="true">mvn:io.swagger/swagger-annotations/${cxf.swagger2.version}</bundle> + <bundle start-level="35" dependency="true">mvn:io.swagger/swagger-models/${cxf.swagger2.version}</bundle> + <bundle start-level="35" dependency="true">mvn:io.swagger/swagger-core/${cxf.swagger2.version}</bundle> + <bundle start-level="35" dependency="true">mvn:io.swagger/swagger-jaxrs/${cxf.swagger2.version}</bundle> + </feature> + <feature name="cxf-databinding-aegis" version="${project.version}"> + <feature version="${project.version}">cxf-wsdl</feature> + <feature version="${project.version}">cxf-bindings-soap</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-databinding-aegis/${project.version}</bundle> + </feature> + <feature name="cxf-databinding-jibx" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-tools</feature> + <bundle start-level="25" dependency="true">mvn:joda-time/joda-time/${cxf.joda.time.version}</bundle> + <bundle start-level="40" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${cxf.xpp3.bundle.version}</bundle> + <bundle start-level="40" dependency="true">mvn:org.jibx/jibx-run/${cxf.jibx.version}</bundle> + <bundle start-level="40" dependency="true">mvn:org.jibx/jibx-bind/${cxf.jibx.version}</bundle> + <bundle start-level="40" dependency="true">mvn:org.jibx/jibx-schema/${cxf.jibx.version}</bundle> + <bundle start-level="40" dependency="true">mvn:org.jibx/jibx-tools/${cxf.jibx.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-databinding-jibx/${project.version}</bundle> + </feature> + <feature name="cxf-databinding-jaxb" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-wsdl</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-databinding-jaxb/${project.version}</bundle> + </feature> + <feature name="cxf-databinding-xmlbeans" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlbeans/${cxf.xmlbeans.bundle.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-databinding-xmlbeans/${project.version}</bundle> + </feature> + <feature name="cxf-features-clustering" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-clustering/${project.version}</bundle> + </feature> + <feature name="cxf-features-logging" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-logging/${project.version}</bundle> + </feature> + <feature name="cxf-features-throttling" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-throttling/${project.version}</bundle> + </feature> + <feature name="cxf-features-metrics" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40" dependency='true'>mvn:io.dropwizard.metrics/metrics-core/${cxf.dropwizard.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-features-metrics/${project.version}</bundle> + </feature> + <feature name="cxf-bindings-corba" version="${project.version}"> + <feature version="${project.version}">cxf-wsdl</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-corba/${project.version}</bundle> + </feature> + <feature name="cxf-bindings-coloc" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-coloc/${project.version}</bundle> + </feature> + <feature name="cxf-bindings-object" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-transports-local</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-bindings-object/${project.version}</bundle> + </feature> + <feature name="cxf-transports-local" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-local/${project.version}</bundle> + </feature> + <feature name="cxf-transports-jms" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-bindings-soap</feature> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${cxf.geronimo.transaction.version}</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${cxf.geronimo.jms.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-jms/${project.version}</bundle> + </feature> + <feature name="cxf-transports-udp" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <bundle dependency="true">mvn:org.apache.mina/mina-core/${cxf.mina.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-udp/${project.version}</bundle> + </feature> + <feature name="cxf-transports-websocket-client" version="${project.version}"> + <feature version="${project.version}">cxf-http</feature> + <bundle dependency='true'>mvn:com.ning/async-http-client/${cxf.ahc.version}</bundle> + <bundle dependency='true'>mvn:io.netty/netty/${cxf.netty3.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-websocket/${project.version}</bundle> + </feature> + <feature name="cxf-transports-websocket-server" version="${project.version}"> + <feature version="${project.version}">cxf-http</feature> + <bundle dependency='true'>mvn:org.atmosphere/atmosphere-runtime/${cxf.atmosphere.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-websocket/${project.version}</bundle> + </feature> + <feature name="cxf-javascript" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-bindings-soap</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-javascript/${project.version}</bundle> + </feature> + <feature name="cxf-frontend-javascript" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-jaxws</feature> + <bundle start-level="40" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rhino/${cxf.rhino.bundle.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-frontend-js/${project.version}</bundle> + </feature> + <feature name="cxf-xjc-runtime" version="${project.version}"> + <feature version="${project.version}">cxf-jaxb</feature> + <bundle start-level="35" dependency="true">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf.xjc-utils/cxf-xjc-runtime/${cxf.xjc-utils.version}</bundle> + </feature> + <feature name="cxf-tools" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-wsdl</feature> + <feature version="${project.version}">cxf-databinding-jaxb</feature> + <feature version="${project.version}">cxf-databinding-aegis</feature> + <feature version="${project.version}">cxf-bindings-soap</feature> + <feature version="${project.version}">cxf-jaxrs</feature> + <feature version="${project.version}">cxf-jaxws</feature> + <feature version="${project.version}">cxf-javascript</feature> + <bundle start-level="35">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle> + <bundle>mvn:org.apache.velocity/velocity/${cxf.velocity.version}</bundle> + <bundle>mvn:commons-collections/commons-collections/${cxf.commons-collections.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-common/${project.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-java2ws/${project.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-misctools/${project.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-validator/${project.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-wadlto-jaxrs/${project.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-core/${project.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-databinding-jaxb/${project.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-javascript/${project.version}</bundle> + <bundle>mvn:org.apache.cxf/cxf-tools-wsdlto-frontend-jaxws/${project.version}</bundle> + <!-- need antlr + <bundle>mvn:org.apache.cxf/cxf-tools-corba/${project.version}</bundle--> + </feature> + <feature name="cxf" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-jaxws</feature> + <feature version="${project.version}">cxf-jaxrs</feature> + <feature version="${project.version}">cxf-databinding-jaxb</feature> + <feature version="${project.version}">cxf-databinding-aegis</feature> + <feature version="${project.version}">cxf-databinding-xmlbeans</feature> + <feature version="${project.version}">cxf-bindings-corba</feature> + <feature version="${project.version}">cxf-bindings-coloc</feature> + <feature version="${project.version}">cxf-bindings-object</feature> + <feature version="${project.version}">cxf-http-jetty</feature> + <feature version="${project.version}">cxf-transports-local</feature> + <feature version="${project.version}">cxf-transports-jms</feature> + <feature version="${project.version}">cxf-transports-udp</feature> + <feature version="${project.version}">cxf-xjc-runtime</feature> + <feature version="${project.version}">cxf-ws-security</feature> + <feature version="${project.version}">cxf-ws-rm</feature> + <feature version="${project.version}">cxf-ws-mex</feature> + <feature version="${project.version}">cxf-javascript</feature> + <feature version="${project.version}">cxf-frontend-javascript</feature> + <feature version="${project.version}">cxf-features-clustering</feature> + <feature version="${project.version}">cxf-features-metrics</feature> + <feature version="${project.version}">cxf-features-throttling</feature> + <feature version="${project.version}">cxf-features-logging</feature> + + <!-- tools really aren't needed in OSGi by default + <feature version="${project.version}">cxf-tools</feature> + --> + <!-- need msv + <bundle>mvn:org.apache.cxf/cxf-wstx-msv-validation/${project.version}</bundle--> + <!-- need sdo deps + <bundle>mvn:org.apache.cxf/cxf-rt-databinding-sdo/${project.version}</bundle--> + </feature> + <feature name="cxf-sts" version="${project.version}"> + <bundle start-level="40" dependency="true">mvn:com.hazelcast/hazelcast/${cxf.hazelcast.version}</bundle> + <bundle start-level="40" dependency="true">mvn:net.sf.ehcache/ehcache/${cxf.ehcache.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-json-basic/${project.version}</bundle> + <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-rs-security-jose/${project.version}</bundle> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-ws-security</feature> + <feature version="${project.version}">cxf-http</feature> + <bundle>mvn:org.apache.cxf.services.sts/cxf-services-sts-core/${project.version}</bundle> + </feature> + <feature name="cxf-wsn-api" version="${project.version}"> + <feature version="${project.version}">cxf-ws-addr</feature> + <feature version="${project.version}">cxf-jaxws</feature> + <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-api/${project.version}</bundle> + </feature> + <feature name="cxf-wsn" version="${project.version}"> + <config name="org.apache.cxf.wsn"> + cxf.wsn.activemq = vm:localhost + cxf.wsn.rootUrl = http://0.0.0.0:8182 + cxf.wsn.context = /wsn + cxf.wsn.activemq.username = karaf + cxf.wsn.activemq.password = karaf + </config> + <!--<feature version="[5.4,6)">activemq</feature>--> + <feature>spring</feature> + <feature version="${project.version}">cxf-wsn-api</feature> + <feature version="${project.version}">cxf-http-jetty</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_6</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle> + <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle> + <bundle dependency="true">mvn:org.apache.activemq/activemq-osgi/5.15.0-SNAPSHOT</bundle> + <bundle>mvn:org.apache.cxf.services.wsn/cxf-services-wsn-core/${project.version}</bundle> + </feature> + <feature name="cxf-ws-discovery-api" version="${project.version}"> + <feature version="${project.version}">cxf-transports-udp</feature> + <feature version="${project.version}">cxf-ws-addr</feature> + <feature version="${project.version}">cxf-jaxws</feature> + <feature>aries-blueprint</feature> + <bundle>mvn:org.apache.cxf.services.ws-discovery/cxf-services-ws-discovery-api/${project.version}</bundle> + </feature> + <feature name="cxf-ws-discovery" version="${project.version}"> + <feature version="${project.version}">cxf-ws-discovery-api</feature> + <bundle>mvn:org.apache.cxf.services.ws-discovery/cxf-services-ws-discovery-service/${project.version}</bundle> + </feature> + + <feature name="cxf-bean-validation-core" version="${project.version}"> + <!-- This feature has the wrong name; it's hibernate-only. Fix up in 3.2.0? Move all this to the + hibernate-bean-validation-helper feature --> + <bundle start-level="30" dependency="true">mvn:org.hibernate/hibernate-validator/${cxf.hibernate.validator.version}</bundle> + <bundle start-level="30" dependency="true">mvn:javax.validation/validation-api/${cxf.validation.api.version}</bundle> + <!-- The servicemix bundle for hibernate demands joda-time --> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.joda-time/${cxf.servicemix.jodatime.version}</bundle> + <!-- The servicemix bundle for hibernate demands jsoup --> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsoup/${cxf.servicemix.jsoup.version}</bundle> + <!-- hibernate requires jboss-logging --> + <bundle start-level="30" dependency="true">mvn:org.jboss.logging/jboss-logging/${cxf.jboss.logging.version}</bundle> + <!-- ditto for classmate --> + <bundle start-level="30" dependency="true">mvn:com.fasterxml/classmate/${cxf.classmate.version}</bundle> + <!-- stax --> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${cxf.servicemix.specs.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.codehaus.woodstox/stax2-api/${cxf.woodstox.stax2-api.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.codehaus.woodstox/woodstox-core-asl/${cxf.woodstox.core.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cxf.servicemix.cglib.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aspectj/${cxf.servicemix.aspectj.version}</bundle> + </feature> + + <feature name="cxf-bean-validation" version="${project.version}"> + <feature version="${project.version}">cxf-bean-validation-core</feature> + <bundle start-level="30" dependency="true">mvn:javax.el/javax.el-api/${cxf.javax.el.version}</bundle> + <bundle start-level="30" dependency="true">mvn:org.glassfish/javax.el/${cxf.javax.el.version}</bundle> + </feature> + + <!-- + <feature name="cxf-management-web" version="${project.version}"> + <feature version="${project.version}">cxf-core</feature> + <feature version="${project.version}">cxf-jaxrs</feature> + <bundle start-level="35" dependency="true">mvn:commons-lang/commons-lang/${cxf.commons-lang.version}</bundle> + <bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle> + <bundle start-level="35">mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle> + <bundle start-level="35">mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle> + <bundle start-level="35">mvn:org.apache.james/apache-mime4j-core/${cxf.james.mim4j.version}</bundle> + <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}"> + <feature version="${project.version}">cxf-jaxrs</feature> + <feature>pax-cdi</feature> + <bundle start-level="40">mvn:org.apache.cxf/cxf-integration-cdi/${project.version}</bundle> + </feature> +</features> http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/osgi/karaf4/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf4/pom.xml b/osgi/karaf4/pom.xml new file mode 100644 index 0000000..d753c10 --- /dev/null +++ b/osgi/karaf4/pom.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. + --> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-parent</artifactId> + <version>3.2.0-SNAPSHOT</version> + <relativePath>../../parent</relativePath> + </parent> + <groupId>org.apache.cxf.karaf4</groupId> + <artifactId>karaf4-parent</artifactId> + <packaging>pom</packaging> + <name>Apache CXF Karaf4 Parent</name> + <description>Apache CXF Karaf4 Parent</description> + <modules> + <module>commands</module> + <module>features</module> + </modules> +</project> http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/osgi/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/pom.xml b/osgi/pom.xml index 5978de5..2614d46 100644 --- a/osgi/pom.xml +++ b/osgi/pom.xml @@ -34,6 +34,7 @@ <module>itests</module> <module>itests-felix</module> <module>karaf</module> + <module>karaf4</module> <module>repository</module> </modules> </project> http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index c19e9f5..10795a6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -183,6 +183,7 @@ <cxf.aries.version.range>[1.0,2)</cxf.aries.version.range> <cxf.osgi.version>4.2.0</cxf.osgi.version> <cxf.karaf.version>3.0.6</cxf.karaf.version> + <cxf.karaf4.version>4.0.6</cxf.karaf4.version> <cxf.pax.logging.version>1.6.0</cxf.pax.logging.version> <cxf.pax.exam.version>4.7.0</cxf.pax.exam.version> <cxf.felix.framework.version>2.0.5</cxf.felix.framework.version> http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/rt/management-web/pom.xml ---------------------------------------------------------------------- diff --git a/rt/management-web/pom.xml b/rt/management-web/pom.xml index f0ad8dc..cae2456 100644 --- a/rt/management-web/pom.xml +++ b/rt/management-web/pom.xml @@ -181,6 +181,10 @@ org.apache.cxf.management.web.browser*, org.apache.cxf.management.web.logging.atom*, </Export-Package> + <Import-Package> + javax.servlet*;version="[2,4)", + * + </Import-Package> </instructions> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/rt/transports/http-netty/netty-client/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-client/pom.xml b/rt/transports/http-netty/netty-client/pom.xml index 0b9193c..541c875 100644 --- a/rt/transports/http-netty/netty-client/pom.xml +++ b/rt/transports/http-netty/netty-client/pom.xml @@ -32,6 +32,7 @@ </parent> <properties> <cxf.osgi.import> + javax.servlet*;version="[2,4)", io.netty.*;version="${cxf.netty.version.range}", javax.annotation;version="${cxf.osgi.javax.annotation.version}", </cxf.osgi.import> http://git-wip-us.apache.org/repos/asf/cxf/blob/042d1dbe/rt/transports/http-netty/netty-server/pom.xml ---------------------------------------------------------------------- diff --git a/rt/transports/http-netty/netty-server/pom.xml b/rt/transports/http-netty/netty-server/pom.xml index fe497b1..19ea5d8 100644 --- a/rt/transports/http-netty/netty-server/pom.xml +++ b/rt/transports/http-netty/netty-server/pom.xml @@ -33,9 +33,11 @@ <properties> <cxf.bundle.activator>org.apache.cxf.transport.http.netty.server.blueprint.Activator</cxf.bundle.activator> <cxf.osgi.import> + javax.servlet*;version="[2,4)", io.netty.*;version="${cxf.netty.version.range}", javax.annotation;version="${cxf.osgi.javax.annotation.version}", org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional, + org.osgi.service.blueprint*;resolution:=optional, org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}" </cxf.osgi.import> <cxf.osgi.export>
