cxf git commit: Minor fixes: updated README.txt, addressing all Checkstyle errors (multiple samples)
Repository: cxf
Updated Branches:
refs/heads/master 66e5cca3c -> aad3a62bf
Minor fixes: updated README.txt, addressing all Checkstyle errors (multiple
samples)
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/aad3a62b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/aad3a62b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/aad3a62b
Branch: refs/heads/master
Commit: aad3a62bf74f3378c4309a611d8b9e498bce14b3
Parents: 66e5cca
Author: reta
Authored: Mon Sep 4 19:48:13 2017 -0400
Committer: reta
Committed: Mon Sep 4 19:48:13 2017 -0400
--
.../java/demo/jaxrs/search/server/Catalog.java | 2 ++
.../samples/jax_rs/tracing_brave/README.txt | 21 ++--
.../demo/jaxrs/tracing/server/CatalogStore.java | 8
.../jaxws/tracing/server/CatalogService.java| 4 ++--
.../tracing/server/impl/CatalogServiceImpl.java | 2 +-
.../demo/ws_rm/common/MessageLossSimulator.java | 3 ++-
6 files changed, 17 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
index 2be12de..540b5c5 100644
---
a/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
+++
b/distribution/src/main/release/samples/jax_rs/search/src/main/java/demo/jaxrs/search/server/Catalog.java
@@ -109,6 +109,7 @@ public class Catalog {
initIndex();
}
+// CHECKSTYLE:OFF: ReturnCount
@POST
@CrossOriginResourceSharing(allowAllOrigins = true)
@Consumes("multipart/form-data")
@@ -156,6 +157,7 @@ public class Catalog {
}
});
}
+// CHECKSTYLE:ON: ReturnCount
@GET
@Produces(MediaType.APPLICATION_JSON)
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
--
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
b/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
index 3a04f91..ceb779f 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
+++ b/distribution/src/main/release/samples/jax_rs/tracing_brave/README.txt
@@ -3,22 +3,13 @@ JAX-RS Brave/OpenZipkin Tracing Demo
The demo shows a basic usage of Brave/OpenZipkin distributed tracer with REST
based
Web Services using JAX-RS 2.0 (JSR-339). The REST server provides the
-following services:
-
-A RESTful catalog service is provided on URL http://localhost:9000/catalog
-
-A HTTP GET request to URL http://localhost:9000/catalog generates following
-traces:
-
-A HTTP POST request to URL http://localhost:9000/catalog generates following
-traces:
-
-A HTTP GET request to URL http://localhost:9000/catalog/ generates
following
-traces:
-
-A HTTP DELETE request to URL http://localhost:9000/catalog/ generates
following
-traces:
+following services at URL http://localhost:9000/catalog:
+ - GET to http://localhost:9000/catalog
+ - POST to http://localhost:9000/catalog
+ - GET to URL http://localhost:9000/catalog/
+ - DELETE to URL http://localhost:9000/catalog/
+
Building and running the demo using Maven
---
http://git-wip-us.apache.org/repos/asf/cxf/blob/aad3a62b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
--
diff --git
a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
index 9b5d656..4ca957c 100644
---
a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
+++
b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/CatalogStore.java
@@ -55,7 +55,7 @@ public class CatalogStore {
}
public boolean remove(final String key) throws IOException {
-try (final Table table =
connection.getTable(TableName.valueOf(tableName))) {
+try (Table table = connection.getTable(TableName.valueOf(tableName))) {
if (get(key) != null) {
final Delete delete = new Delete(Bytes.toB
cxf git commit: Minor fixes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 8e5bae551 -> 40618c9c7
Minor fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/40618c9c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/40618c9c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/40618c9c
Branch: refs/heads/3.0.x-fixes
Commit: 40618c9c7e6b4314279f6582a73bae7b42657b31
Parents: 8e5bae5
Author: reta
Authored: Mon Feb 9 19:01:09 2015 -0500
Committer: Sergey Beryozkin
Committed: Wed Feb 11 10:43:30 2015 +
--
.../JaxrsServletContainerInitializer.java | 22
systests/rs-http-sci/pom.xml| 13 ++--
2 files changed, 15 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cxf/blob/40618c9c/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
--
diff --git
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
index c872926..18473f2 100644
---
a/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
+++
b/rt/rs/http-sci/src/main/java/org/apache/cxf/jaxrs/servlet/JaxrsServletContainerInitializer.java
@@ -161,11 +161,13 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
grouped.put(Provider.class, new ArrayList< Class< ? > >());
grouped.put(Path.class, new ArrayList< Class< ? > >());
-for (final Class< ? > clazz: classes) {
-if (!classShouldBeIgnored(clazz)) {
-for (final Class< ? extends Annotation > annotation:
grouped.keySet()) {
-if (clazz.isAnnotationPresent(annotation)) {
-grouped.get(annotation).add(clazz);
+if (classes != null) {
+for (final Class< ? > clazz: classes) {
+if (!classShouldBeIgnored(clazz)) {
+for (final Class< ? extends Annotation > annotation:
grouped.keySet()) {
+if (clazz.isAnnotationPresent(annotation)) {
+grouped.get(annotation).add(clazz);
+}
}
}
}
@@ -179,10 +181,12 @@ public class JaxrsServletContainerInitializer implements
ServletContainerInitial
}
private static Class< ? > findCandidate(final Set< Class< ? > > classes) {
-for (final Class< ? > clazz: classes) {
-if (Application.class.isAssignableFrom(clazz) &&
!classShouldBeIgnored(clazz)) {
-LOG.fine("Found JAX-RS application to initialize: " +
clazz.getName());
-return clazz;
+if (classes != null) {
+for (final Class< ? > clazz: classes) {
+if (Application.class.isAssignableFrom(clazz) &&
!classShouldBeIgnored(clazz)) {
+LOG.fine("Found JAX-RS application to initialize: " +
clazz.getName());
+return clazz;
+}
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/40618c9c/systests/rs-http-sci/pom.xml
--
diff --git a/systests/rs-http-sci/pom.xml b/systests/rs-http-sci/pom.xml
index 1214d41..b0644bf 100644
--- a/systests/rs-http-sci/pom.xml
+++ b/systests/rs-http-sci/pom.xml
@@ -34,6 +34,7 @@
-XX:MaxPermSize=192m
-XX:MaxPermSize=192m
7.0.52
+9.2.3.v20140905
@@ -114,17 +115,7 @@
org.apache.httpcomponents
httpclient
test
-
-
-org.apache.tomcat.embed
-tomcat-embed-core
-${cxf.tomcat.version}
-
-
-org.apache.tomcat.embed
-tomcat-embed-logging-juli
-${cxf.tomcat.version}
-
+
com.ning
async-http-client
