cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject cxf git commit: make websocket_osgi sample also work for both karaf 4.0.x
Date Tue, 05 Apr 2016 09:05:44 GMT
Repository: cxf
Updated Branches:
  refs/heads/master 64e7c75d2 -> b2c10cc6c


make websocket_osgi sample also work for both karaf 4.0.x


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

Branch: refs/heads/master
Commit: b2c10cc6c18a6e6589d258436303c46b3f682f7e
Parents: 64e7c75
Author: Akitoshi Yoshida <ay@apache.org>
Authored: Tue Apr 5 10:38:42 2016 +0200
Committer: Akitoshi Yoshida <ay@apache.org>
Committed: Tue Apr 5 11:04:55 2016 +0200

----------------------------------------------------------------------
 .../src/main/release/samples/jax_rs/websocket_osgi/README.txt    | 4 ++--
 .../src/main/release/samples/jax_rs/websocket_osgi/pom.xml       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/b2c10cc6/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
index 60d7705..efc7000 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/README.txt
@@ -16,8 +16,8 @@ Using either UNIX or Windows:
 
 This will produce a war file in the target folder.
 
-
-Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start.html)
+Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start.html.
+You can also use Karaf 4.0.x for this demo.)
 
   bin/karaf
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/b2c10cc6/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
index e0d1234..3dac0f3 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/pom.xml
@@ -48,6 +48,8 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.groupId}.${project.artifactId};blueprint.aries.xml-validation:=false</Bundle-SymbolicName>
                         <Import-Package>
+                            javax.servlet;version="[2.6,4)",
+                            javax.servlet.http;version="[2.6,4)",
                             javax.ws.rs,
                             javax.ws.rs.core,
                             org.apache.cxf.jaxrs.provider,


Mime
View raw message