cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject git commit: split the feature in two parts for CXF-5747
Date Mon, 02 Jun 2014 15:10:04 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 953dbb003 -> d278bb255


split the feature in two parts for CXF-5747


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d278bb25
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d278bb25
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d278bb25

Branch: refs/heads/master
Commit: d278bb255ee8a9bf497731faaad883b43e3d3385
Parents: 953dbb0
Author: Akitoshi Yoshida <ay@apache.org>
Authored: Mon Jun 2 17:09:47 2014 +0200
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Mon Jun 2 17:09:56 2014 +0200

----------------------------------------------------------------------
 osgi/karaf/features/src/main/resources/features.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/d278bb25/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 9999f4d..ccc2061 100644
--- a/osgi/karaf/features/src/main/resources/features.xml
+++ b/osgi/karaf/features/src/main/resources/features.xml
@@ -264,7 +264,13 @@
         <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" version="${project.version}" resolver="(obr)">
+    <feature name="cxf-transports-websocket-client" version="${project.version}" resolver="(obr)">
+        <feature version="[3,4)">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}" resolver="(obr)">
         <feature version="[3,4)">cxf-http</feature>
         <bundle start-level="40">mvn:org.apache.cxf/cxf-rt-transports-websocket/${project.version}</bundle>
     </feature>


Mime
View raw message