You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by gn...@apache.org on 2016/09/20 13:07:34 UTC
[1/2] cxf git commit: [CXF-7060] Provide a cxf-http-provider feature
to be used when in need of a provider-agnostic http transport
Repository: cxf
Updated Branches:
refs/heads/master 629af817f -> d8a0a04d9
[CXF-7060] Provide a cxf-http-provider feature to be used when in need of a provider-agnostic http transport
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d8a0a04d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d8a0a04d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d8a0a04d
Branch: refs/heads/master
Commit: d8a0a04d9b8b5206c2e24e976a94f328c73a49bf
Parents: bcb96eb
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Sep 20 15:04:20 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Sep 20 15:06:51 2016 +0200
----------------------------------------------------------------------
.../features/src/main/resources/features.xml | 28 ++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d8a0a04d/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
index fef8dbf..8db5d65 100644
--- a/osgi/karaf4/features/src/main/resources/features.xml
+++ b/osgi/karaf4/features/src/main/resources/features.xml
@@ -154,11 +154,26 @@
<feature>http</feature>
<bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-http/${project.version}</bundle>
</feature>
+ <!--
+ This feature can be used to depend on the feature providing a HttpDestinationFactory extension
+ without depending on the actual provider (see cxf-wsn for example).
+ It will install cxf-http-jetty by default, unless the user explicitly installs a different
+ provider, such as cxf-http-undertow.
+ -->
+ <feature name="cxf-http-provider" version="${project.version}">
+ <feature dependency="true" version="${project.version}">cxf-http-jetty</feature>
+ <requirement>
+ cxf.http.provider
+ </requirement>
+ </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>
+ <capability>
+ cxf.http.provider;name=jetty
+ </capability>
</feature>
<feature name="cxf-http-async" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
@@ -166,6 +181,9 @@
<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>
+ <capability>
+ cxf.http.provider;name=async
+ </capability>
</feature>
<feature name="cxf-http-netty-client" version="${project.version}">
<feature version="${project.version}">cxf-http</feature>
@@ -187,12 +205,18 @@
<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>
+ <capability>
+ cxf.http.provider;name=netty
+ </capability>
</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>
+ <capability>
+ cxf.http.provider;name=undertow
+ </capability>
</feature>
<feature name="cxf-bindings-soap" version="${project.version}">
<feature version="${project.version}">cxf-wsdl</feature>
@@ -401,7 +425,7 @@
<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-http-provider</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>
@@ -450,7 +474,7 @@
<feature>spring</feature>
<feature>aries-blueprint</feature>
<feature version="${project.version}">cxf-wsn-api</feature>
- <feature version="${project.version}">cxf-http-jetty</feature>
+ <feature version="${project.version}">cxf-http-provider</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>
Re: [1/2] cxf git commit: [CXF-7060] Provide a cxf-http-provider
feature to be used when in need of a provider-agnostic http transport
Posted by Guillaume Nodet <gn...@apache.org>.
Good catch, I pick the wrong one.
I think I need to move that capability to the web socket server transport
instead which actually provides a HttpDestinationFactory.
2016-09-20 15:25 GMT+02:00 Daniel Kulp <dk...@apache.org>:
>
> On Sep 20, 2016, at 9:07 AM, gnodet@apache.org wrote:
>
> <feature name="cxf-http-async" version="${project.version}">
> <feature version="${project.version}">cxf-http</feature>
> @@ -166,6 +181,9 @@
> <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>
> + <capability>
> + cxf.http.provider;name=async
> + </capability>
> </feature>
>
>
>
> The async is a client side only thing, not server side. The others seem
> to be selecting the server side. Is this setting needed here?
>
> --
> Daniel Kulp
> dkulp@apache.org - http://dankulp.com/blog
> Talend Community Coder - http://coders.talend.com
>
>
--
------------------------
Guillaume Nodet
------------------------
Red Hat, Open Source Integration
Email: gnodet@redhat.com
Web: http://fusesource.com
Blog: http://gnodet.blogspot.com/
Re: [1/2] cxf git commit: [CXF-7060] Provide a cxf-http-provider
feature to be used when in need of a provider-agnostic http transport
Posted by Daniel Kulp <dk...@apache.org>.
> On Sep 20, 2016, at 9:07 AM, gnodet@apache.org wrote:
>
> <feature name="cxf-http-async" version="${project.version}">
> <feature version="${project.version}">cxf-http</feature>
> @@ -166,6 +181,9 @@
> <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>
> + <capability>
> + cxf.http.provider;name=async
> + </capability>
> </feature>
The async is a client side only thing, not server side. The others seem to be selecting the server side. Is this setting needed here?
--
Daniel Kulp
dkulp@apache.org <ma...@apache.org> - http://dankulp.com/blog <http://dankulp.com/blog>
Talend Community Coder - http://coders.talend.com <http://coders.talend.com/>
[2/2] cxf git commit: [CXF-7060] Use 1.3 version of the namespace and
remove snapshots references
Posted by gn...@apache.org.
[CXF-7060] Use 1.3 version of the namespace and remove snapshots references
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bcb96eb5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bcb96eb5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bcb96eb5
Branch: refs/heads/master
Commit: bcb96eb5cbdfcd473da2ef64709ec0dc541d3609
Parents: 629af81
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Sep 20 13:05:27 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Sep 20 15:06:51 2016 +0200
----------------------------------------------------------------------
osgi/karaf4/features/src/main/resources/features.xml | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bcb96eb5/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
index 6d98973..fef8dbf 100644
--- a/osgi/karaf4/features/src/main/resources/features.xml
+++ b/osgi/karaf4/features/src/main/resources/features.xml
@@ -16,11 +16,9 @@
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}">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.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>
@@ -449,14 +447,14 @@
cxf.wsn.activemq.username = karaf
cxf.wsn.activemq.password = karaf
</config>
- <!--<feature version="[5.4,6)">activemq</feature>-->
<feature>spring</feature>
+ <feature>aries-blueprint</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 dependency="true">mvn:org.apache.activemq/activemq-osgi/5.14.0</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}">