make websocket_osgi sample also work for both karaf 4.0.x (for cxf-3.1.x)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/75edfe9d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/75edfe9d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/75edfe9d Branch: refs/heads/3.1.x-fixes Commit: 75edfe9d21fd654d844e24038a72206b4e15457d Parents: 5ce6827 Author: Akitoshi Yoshida <a...@apache.org> Authored: Tue Apr 5 10:38:42 2016 +0200 Committer: Akitoshi Yoshida <a...@apache.org> Committed: Tue Apr 5 14:33:29 2016 +0200 ---------------------------------------------------------------------- .../samples/jax_rs/websocket_osgi/README.txt | 58 ++++++++++---------- .../samples/jax_rs/websocket_osgi/pom.xml | 10 ++-- 2 files changed, 35 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/75edfe9d/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..09cf100 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,23 +16,22 @@ 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. +You can also use Karaf 4.0.x for this demo.) -Starting Karaf (refer to http://karaf.apache.org/manual/latest-3.0.x/quick-start.html) +$ bin/karaf + __ __ ____ + / //_/____ __________ _/ __/ + / ,< / __ `/ ___/ __ `/ /_ + / /| |/ /_/ / / / /_/ / __/ + /_/ |_|\__,_/_/ \__,_/_/ - bin/karaf + Apache Karaf (3.0.4) +Hit '<tab>' for a list of available commands +and '[cmd] --help' for help on a specific command. +Hit '<ctrl-d>' or type 'system:shutdown' or 'logout' to shutdown Karaf. - __ __ ____ - / //_/____ __________ _/ __/ - / ,< / __ `/ ___/ __ `/ /_ - / /| |/ /_/ / / / /_/ / __/ - /_/ |_|\__,_/_/ \__,_/_/ - - Apache Karaf (3.0.4) - - Hit '<tab>' for a list of available commands - and '[cmd] --help' for help on a specific command. - Hit '<ctrl-d>' or type 'system:shutdown' or 'logout' to shutdown Karaf. In order to install CXF's features, you need to add the CXF's features repo using @@ -52,28 +51,29 @@ Install this demo bundle (using the appropriate bundle version number) And verify the bundles are installed. -karaf@root()> feature:repo-add cxf 3.2.0-SNAPSHOT -Adding feature url mvn:org.apache.cxf.karaf/apache-cxf/3.2.0-SNAPSHOT/xml/features + +karaf@root()> feature:repo-add cxf 3.1.7-SNAPSHOT +Adding feature url mvn:org.apache.cxf.karaf/apache-cxf/3.1.7-SNAPSHOT/xml/features karaf@root()> feature:install cxf-jaxrs cxf-transports-websocket-server -karaf@root()> list -t 0 | grep CXF - 80 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Core - 81 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime Management -100 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime HTTP Transport -102 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Extensions: Providers -103 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Extensions: Search -104 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Service Description -105 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime JAX-RS Frontend -106 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF JAX-RS Client -108 | Active | 40 | 3.2.0.SNAPSHOT | Apache CXF Runtime WebSocket Transport -karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi +karaf@root()> install -s mvn:org.apache.cxf.samples/jax_rs_websocket_osgi/3.1.7-SNAPSHOT Bundle ID: 109 +karaf@root()> list -t 0 | grep CXF + 80 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF Core + 81 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF Runtime Management +100 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF Runtime HTTP Transport +102 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF JAX-RS Extensions: Providers +103 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF JAX-RS Extensions: Search +104 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF JAX-RS Service Description +105 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF Runtime JAX-RS Frontend +106 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF JAX-RS Client +108 | Active | 40 | 3.1.7.SNAPSHOT | Apache CXF Runtime WebSocket Transport karaf@root()> list START LEVEL 100 , List Threshold: 50 ID | State | Lvl | Version | Name --------------------------------------------------------------------- -107 | Active | 80 | 2.4.3 | atmosphere-runtime -109 | Active | 80 | 3.2.0.SNAPSHOT | JAX-RS WebSocket Blueprint Demo -karaf@root()> +107 | Active | 80 | 2.3.7 | atmosphere-runtime +109 | Active | 80 | 3.1.7.SNAPSHOT | JAX-RS WebSocket Blueprint Demo +karaf@root()> Visit http://localhost:8181/cxf/ to see if this RESTful service is registered. http://git-wip-us.apache.org/repos/asf/cxf/blob/75edfe9d/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..16e1988 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 @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.cxf.samples</groupId> <artifactId>cxf-samples</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.7-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> <properties> @@ -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, @@ -66,17 +68,17 @@ <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.7-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-websocket</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.7-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxrs</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.7-SNAPSHOT</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId>