[04/16] cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

2016-07-31 Thread reta
add jax_rs/websocket_osgi in samples/pom.xml


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 45d54d558625236b84752b0d7976f0cf85518c16
Parents: f5e7533
Author: Akitoshi Yoshida 
Authored: Fri Jul 29 00:05:25 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Jul 29 00:06:07 2016 +0200

--
 .../src/main/release/samples/jax_rs/websocket_web/pom.xml| 4 ++--
 distribution/src/main/release/samples/pom.xml| 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45d54d55/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 49c4540..1976690 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -20,8 +20,8 @@
 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";>
 4.0.0
 jax_rs_websocket_web
-JAX-RS WebSocket Demo
-JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket Demo
 war
 
 org.apache.cxf.samples

http://git-wip-us.apache.org/repos/asf/cxf/blob/45d54d55/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index d73a7d0..ca874f3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -52,6 +52,7 @@
 jax_rs/basic
 jax_rs/websocket
 jax_rs/websocket_web
+jax_rs/websocket_osgi
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2



cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

2016-07-28 Thread ay
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes bc3ccc3ab -> fcf585eb1


add jax_rs/websocket_osgi in samples/pom.xml


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

Branch: refs/heads/3.1.x-fixes
Commit: fcf585eb1b260c320281f1a5128307e9ae082547
Parents: bc3ccc3
Author: Akitoshi Yoshida 
Authored: Fri Jul 29 00:05:25 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Jul 29 00:16:20 2016 +0200

--
 .../main/release/samples/jax_rs/websocket_osgi/pom.xml  |  8 
 .../main/release/samples/jax_rs/websocket_web/pom.xml   | 12 ++--
 distribution/src/main/release/samples/pom.xml   |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/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 16e1988..f63bfc1 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 @@
 
 org.apache.cxf.samples
 cxf-samples
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 ../..
 
 
@@ -68,17 +68,17 @@
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-websocket
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 javax.ws.rs

http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 7b76bbc..0b57c11 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -20,13 +20,13 @@
 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";>
 4.0.0
 jax_rs_websocket_web
-JAX-RS WebSocket Demo
-JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket Demo
 war
 
 org.apache.cxf.samples
 cxf-samples
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 ../..
 
 
@@ -82,17 +82,17 @@
 
 org.apache.cxf
 cxf-rt-transports-http
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-transports-websocket
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 org.apache.cxf
 cxf-rt-frontend-jaxrs
-3.1.7-SNAPSHOT
+3.1.8-SNAPSHOT
 
 
 javax.ws.rs

http://git-wip-us.apache.org/repos/asf/cxf/blob/fcf585eb/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 668792b..88d1ac0 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -51,6 +51,8 @@
 jax_rs/basic_https
 jax_rs/basic
 jax_rs/websocket
+jax_rs/websocket_web
+jax_rs/websocket_osgi
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2



cxf git commit: add jax_rs/websocket_osgi in samples/pom.xml

2016-07-28 Thread ay
Repository: cxf
Updated Branches:
  refs/heads/master f5e753380 -> 45d54d558


add jax_rs/websocket_osgi in samples/pom.xml


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

Branch: refs/heads/master
Commit: 45d54d558625236b84752b0d7976f0cf85518c16
Parents: f5e7533
Author: Akitoshi Yoshida 
Authored: Fri Jul 29 00:05:25 2016 +0200
Committer: Akitoshi Yoshida 
Committed: Fri Jul 29 00:06:07 2016 +0200

--
 .../src/main/release/samples/jax_rs/websocket_web/pom.xml| 4 ++--
 distribution/src/main/release/samples/pom.xml| 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/45d54d55/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
--
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml 
b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
index 49c4540..1976690 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml
@@ -20,8 +20,8 @@
 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";>
 4.0.0
 jax_rs_websocket_web
-JAX-RS WebSocket Demo
-JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket WebApp Demo
+JAX-RS WebSocket Demo
 war
 
 org.apache.cxf.samples

http://git-wip-us.apache.org/repos/asf/cxf/blob/45d54d55/distribution/src/main/release/samples/pom.xml
--
diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index d73a7d0..ca874f3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -52,6 +52,7 @@
 jax_rs/basic
 jax_rs/websocket
 jax_rs/websocket_web
+jax_rs/websocket_osgi
 jax_rs/search
 jax_rs/description_swagger
 jax_rs/description_swagger2