You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2017/02/14 09:49:30 UTC
[25/51] [partial] cxf git commit: Remove all trailing whitespaces
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
index 407300b..c57083d 100644
--- a/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/tracing_htrace/src/main/java/demo/jaxrs/tracing/server/Server.java
@@ -29,11 +29,11 @@ public class Server {
// Register and map the dispatcher servlet
final ServletHolder servletHolder = new ServletHolder(new CXFNonSpringJaxrsServlet());
- final ServletContextHandler context = new ServletContextHandler();
+ final ServletContextHandler context = new ServletContextHandler();
context.setContextPath("/");
context.addServlet(servletHolder, "/*");
-
- servletHolder.setInitParameter("javax.ws.rs.Application",
+
+ servletHolder.setInitParameter("javax.ws.rs.Application",
CatalogApplication.class.getName());
server.setHandler(context);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
index 10e3917..cf37b6e 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/Client.java
@@ -63,7 +63,7 @@ public final class Client {
client.await(5);
responses = client.getReceivedResponses();
System.out.println(responses.get(0));
-
+
// Sent POST request to add customer
client.reset(1);
System.out.println("Sent POST request to add customer");
@@ -85,7 +85,7 @@ public final class Client {
client2.await(5);
responses = client2.getReceivedResponses();
System.out.println(responses.get(0));
-
+
// one retrieval, one delete
client2.reset(2);
client.reset(2);
@@ -95,9 +95,9 @@ public final class Client {
client2.await(5);
responses = client2.getReceivedResponses();
for (Object o : responses) {
- System.out.println(o);
+ System.out.println(o);
}
-
+
client.close();
client2.close();
System.exit(0);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
index 8e958a9..064c5eb 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/client/WebSocketTestClient.java
@@ -42,7 +42,7 @@ import org.apache.cxf.common.logging.LogUtils;
/**
* Test client to do websocket calls.
* @see JAXRSClientServerWebSocketTest
- *
+ *
* we may put this in test-tools so that other systests can use this code.
* for now keep it here to experiment jaxrs websocket scenarios.
*/
@@ -55,7 +55,7 @@ class WebSocketTestClient {
private AsyncHttpClient client;
private WebSocket websocket;
private String url;
-
+
WebSocketTestClient(String url) {
this.received = new ArrayList<>();
this.fragments = new ArrayList<>();
@@ -63,7 +63,7 @@ class WebSocketTestClient {
this.client = new AsyncHttpClient();
this.url = url;
}
-
+
public void connect() throws InterruptedException, ExecutionException, IOException {
websocket = client.prepareGet(url).execute(
new WebSocketUpgradeHandler.Builder().addWebSocketListener(new WsSocketListener()).build()).get();
@@ -76,11 +76,11 @@ class WebSocketTestClient {
public void sendMessage(byte[] message) {
websocket.sendMessage(message);
}
-
+
public boolean await(int secs) throws InterruptedException {
return latch.await(secs, TimeUnit.SECONDS);
}
-
+
public void reset(int count) {
latch = new CountDownLatch(count);
received.clear();
@@ -98,7 +98,7 @@ class WebSocketTestClient {
}
return responses;
}
-
+
public void close() {
websocket.close();
client.close();
@@ -107,15 +107,15 @@ class WebSocketTestClient {
class WsSocketListener implements WebSocketTextListener, WebSocketByteListener {
public void onOpen(WebSocket ws) {
- LOG.info("[ws] opened");
+ LOG.info("[ws] opened");
}
public void onClose(WebSocket ws) {
- LOG.info("[ws] closed");
+ LOG.info("[ws] closed");
}
public void onError(Throwable t) {
- LOG.info("[ws] error: " + t);
+ LOG.info("[ws] error: " + t);
}
public void onMessage(byte[] message) {
@@ -137,7 +137,7 @@ class WebSocketTestClient {
public void onFragment(String fragment, boolean last) {
processFragments(fragment, last);
}
-
+
private void processFragments(Object f, boolean last) {
synchronized (fragments) {
fragments.add(f);
@@ -169,7 +169,7 @@ class WebSocketTestClient {
}
}
}
-
+
private static String makeString(byte[] data) {
return data == null ? null : makeString(data, 0, data.length).toString();
}
@@ -186,11 +186,11 @@ class WebSocketTestClient {
}
return xbuf.append(cbuf);
}
-
+
private static void writeHex(StringBuilder buf, int b) {
buf.append(Integer.toHexString(0x100 | (0xff & b)).substring(1)).append(' ');
}
-
+
private static void writePrintable(StringBuilder buf, int b) {
if (b == 0x0d) {
buf.append("\\r");
@@ -205,15 +205,15 @@ class WebSocketTestClient {
}
buf.append(' ');
}
-
+
//TODO this is a temporary way to verify the response; we should come up with something better.
public static class Response {
private Object data;
- private int pos;
+ private int pos;
private int statusCode;
private String contentType;
private Object entity;
-
+
Response(Object data) {
this.data = data;
String line;
@@ -240,25 +240,25 @@ class WebSocketTestClient {
System.arraycopy((byte[])data, pos, (byte[])entity, 0, ((byte[])entity).length);
}
}
-
+
private static boolean isStatusCode(String line) {
char c = line.charAt(0);
return '0' <= c && c <= '9';
}
-
+
public int getStatusCode() {
return statusCode;
}
-
+
public String getContentType() {
return contentType;
}
-
+
@SuppressWarnings("unused")
public Object getEntity() {
return entity;
}
-
+
public String getTextEntity() {
return gettext(entity);
}
@@ -270,7 +270,7 @@ class WebSocketTestClient {
sb.append("Entity: ").append(gettext(entity)).append("\r\n");
return sb.toString();
}
-
+
private String readLine() {
StringBuilder sb = new StringBuilder();
while (pos < length(data)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
index ac765a2..ce3297c 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -133,13 +133,13 @@ public class CustomerService {
@Produces("text/*")
public StreamingOutput monitorCustomers(
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
return new StreamingOutput() {
public void write(final OutputStream out) throws IOException, WebApplicationException {
monitors.put(key, new WriterHolder(out, MAX_ERROR_COUNT));
out.write(("Subscribed at " + new java.util.Date()).getBytes());
}
-
+
};
}
@@ -149,7 +149,7 @@ public class CustomerService {
public void monitorCustomers2(
@javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
try {
httpResponse.getOutputStream().write(("Subscribed at " + new java.util.Date()).getBytes());
@@ -162,14 +162,14 @@ public class CustomerService {
@Path("/unmonitor/{key}")
@Produces("text/*")
public String unmonitorCustomers(@PathParam("key") String key) {
- return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
@GET
@Path("/unmonitor2/{key}")
@Produces("text/*")
public String unmonitorCustomers2(@PathParam("key") String key) {
- return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
// CHECKSTYLE:OFF
@@ -199,7 +199,7 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
@@ -229,7 +229,7 @@ public class CustomerService {
}
// CHECKSTYLE:ON
-
+
final void init() {
Customer c = new Customer();
c.setName("John");
@@ -239,7 +239,7 @@ public class CustomerService {
c.setName("Homer");
c.setId(235);
customers.put(c.getId(), c);
-
+
Order o = new Order();
o.setDescription("order 223");
o.setId(223);
@@ -248,7 +248,7 @@ public class CustomerService {
private static class WriterHolder<T> {
private final T value;
- private final int max;
+ private final int max;
private final AtomicInteger errorCount;
WriterHolder(T object, int max) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
index 851a512..9a7ad62 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket/src/main/java/demo/jaxrs/server/Server.java
@@ -29,7 +29,7 @@ public class Server {
protected Server() throws Exception {
JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean();
sf.setResourceClasses(CustomerService.class);
- sf.setResourceProvider(CustomerService.class,
+ sf.setResourceProvider(CustomerService.class,
new SingletonResourceProvider(new CustomerService()));
sf.setAddress(HOST_URL + CONTEXT_PATH);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
index ac765a2..ce3297c 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_osgi/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -133,13 +133,13 @@ public class CustomerService {
@Produces("text/*")
public StreamingOutput monitorCustomers(
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
return new StreamingOutput() {
public void write(final OutputStream out) throws IOException, WebApplicationException {
monitors.put(key, new WriterHolder(out, MAX_ERROR_COUNT));
out.write(("Subscribed at " + new java.util.Date()).getBytes());
}
-
+
};
}
@@ -149,7 +149,7 @@ public class CustomerService {
public void monitorCustomers2(
@javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
try {
httpResponse.getOutputStream().write(("Subscribed at " + new java.util.Date()).getBytes());
@@ -162,14 +162,14 @@ public class CustomerService {
@Path("/unmonitor/{key}")
@Produces("text/*")
public String unmonitorCustomers(@PathParam("key") String key) {
- return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
@GET
@Path("/unmonitor2/{key}")
@Produces("text/*")
public String unmonitorCustomers2(@PathParam("key") String key) {
- return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
// CHECKSTYLE:OFF
@@ -199,7 +199,7 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
@@ -229,7 +229,7 @@ public class CustomerService {
}
// CHECKSTYLE:ON
-
+
final void init() {
Customer c = new Customer();
c.setName("John");
@@ -239,7 +239,7 @@ public class CustomerService {
c.setName("Homer");
c.setId(235);
customers.put(c.getId(), c);
-
+
Order o = new Order();
o.setDescription("order 223");
o.setId(223);
@@ -248,7 +248,7 @@ public class CustomerService {
private static class WriterHolder<T> {
private final T value;
- private final int max;
+ private final int max;
private final AtomicInteger errorCount;
WriterHolder(T object, int max) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
index ac765a2..ce3297c 100644
--- a/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
+++ b/distribution/src/main/release/samples/jax_rs/websocket_web/src/main/java/demo/jaxrs/server/CustomerService.java
@@ -133,13 +133,13 @@ public class CustomerService {
@Produces("text/*")
public StreamingOutput monitorCustomers(
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
return new StreamingOutput() {
public void write(final OutputStream out) throws IOException, WebApplicationException {
monitors.put(key, new WriterHolder(out, MAX_ERROR_COUNT));
out.write(("Subscribed at " + new java.util.Date()).getBytes());
}
-
+
};
}
@@ -149,7 +149,7 @@ public class CustomerService {
public void monitorCustomers2(
@javax.ws.rs.core.Context final HttpServletResponse httpResponse,
@HeaderParam(WebSocketConstants.DEFAULT_REQUEST_ID_KEY) String reqid) {
- final String key = reqid == null ? "*" : reqid;
+ final String key = reqid == null ? "*" : reqid;
monitors2.put(key, new WriterHolder(httpResponse, MAX_ERROR_COUNT));
try {
httpResponse.getOutputStream().write(("Subscribed at " + new java.util.Date()).getBytes());
@@ -162,14 +162,14 @@ public class CustomerService {
@Path("/unmonitor/{key}")
@Produces("text/*")
public String unmonitorCustomers(@PathParam("key") String key) {
- return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
@GET
@Path("/unmonitor2/{key}")
@Produces("text/*")
public String unmonitorCustomers2(@PathParam("key") String key) {
- return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
+ return (monitors2.remove(key) != null ? "Removed: " : "Already removed: ") + key;
}
// CHECKSTYLE:OFF
@@ -199,7 +199,7 @@ public class CustomerService {
}
}
}
- for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
+ for (Iterator<WriterHolder<HttpServletResponse>> it = monitors2.values().iterator();
it.hasNext();) {
WriterHolder<HttpServletResponse> wh = it.next();
try {
@@ -229,7 +229,7 @@ public class CustomerService {
}
// CHECKSTYLE:ON
-
+
final void init() {
Customer c = new Customer();
c.setName("John");
@@ -239,7 +239,7 @@ public class CustomerService {
c.setName("Homer");
c.setId(235);
customers.put(c.getId(), c);
-
+
Order o = new Order();
o.setDescription("order 223");
o.setId(223);
@@ -248,7 +248,7 @@ public class CustomerService {
private static class WriterHolder<T> {
private final T value;
- private final int max;
+ private final int max;
private final AtomicInteger errorCount;
WriterHolder(T object, int max) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
index 52a3f1f..7c56ae8 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/Client.java
@@ -27,7 +27,7 @@ import org.apache.cxf.frontend.ClientProxyFactoryBean;
public final class Client {
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
ClientProxyFactoryBean factory = new ClientProxyFactoryBean();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java
index 005cd94..9775561 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/client/HelloWorld.java
@@ -22,7 +22,7 @@ package demo.hw.client;
* A 'clean' copy of the SEI that does not have any annotations.
*/
public interface HelloWorld {
-
+
String sayHi(String text);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
index 67b543a..b80a2a4 100644
--- a/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
+++ b/distribution/src/main/release/samples/jax_server_aegis_client/src/main/java/demo/hw/server/HelloWorld.java
@@ -23,7 +23,7 @@ import javax.jws.WebService;
@WebService
public interface HelloWorld {
-
+
String sayHi(@WebParam(name = "greeting") String text);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
index 102a569..13f8124 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/Client.java
@@ -35,18 +35,18 @@ import org.apache.hello_world_async_soap_http.types.GreetMeSometimeResponse;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://apache.org/hello_world_async_soap_http", "SOAPService");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
-
- if (args.length == 0) {
+
+ if (args.length == 0) {
System.out.println("please specify wsdl");
- System.exit(1);
+ System.exit(1);
}
URL url = null;
File wsdl = new File(args[0]);
@@ -55,36 +55,36 @@ public final class Client {
} else {
url = new URL(args[0]);
}
-
+
SOAPService ss = new SOAPService(url, SERVICE_NAME);
ExecutorService executor = Executors.newFixedThreadPool(5);
ss.setExecutor(executor);
GreeterAsync port = ss.getSoapPort();
- String resp;
-
+ String resp;
+
// callback method
TestAsyncHandler testAsyncHandler = new TestAsyncHandler();
System.out.println("Invoking greetMeSometimeAsync using callback object...");
Future<?> response = port.greetMeSometimeAsync(System.getProperty("user.name"), testAsyncHandler);
while (!response.isDone()) {
Thread.sleep(100);
- }
+ }
resp = testAsyncHandler.getResponse();
System.out.println();
System.out.println("Server responded through callback with: " + resp);
System.out.println();
-
+
//polling method
System.out.println("Invoking greetMeSometimeAsync using polling...");
- Response<GreetMeSometimeResponse> greetMeSomeTimeResp =
+ Response<GreetMeSometimeResponse> greetMeSomeTimeResp =
port.greetMeSometimeAsync(System.getProperty("user.name"));
while (!greetMeSomeTimeResp.isDone()) {
Thread.sleep(100);
}
GreetMeSometimeResponse reply = greetMeSomeTimeResp.get();
- System.out.println("Server responded through polling with: " + reply.getResponseType());
+ System.out.println("Server responded through polling with: " + reply.getResponseType());
- System.exit(0);
+ System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
index 30d83bc..d807b8c 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/client/TestAsyncHandler.java
@@ -26,7 +26,7 @@ import org.apache.hello_world_async_soap_http.types.GreetMeSometimeResponse;
public class TestAsyncHandler implements AsyncHandler<GreetMeSometimeResponse> {
-
+
private GreetMeSometimeResponse reply;
public void handleResponse(Response<GreetMeSometimeResponse> response) {
@@ -37,9 +37,9 @@ public class TestAsyncHandler implements AsyncHandler<GreetMeSometimeResponse> {
ex.printStackTrace();
}
}
-
+
public String getResponse() {
return reply.getResponseType();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
index dff8db7..2f0e2fb 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/GreeterImpl.java
@@ -32,15 +32,15 @@ import org.apache.cxf.jaxws.ServerAsyncResponse;
import org.apache.hello_world_async_soap_http.GreeterAsync;
import org.apache.hello_world_async_soap_http.types.GreetMeSometimeResponse;
-@WebService(serviceName = "SOAPService",
- portName = "SoapPort",
+@WebService(serviceName = "SOAPService",
+ portName = "SoapPort",
endpointInterface = "org.apache.hello_world_async_soap_http.GreeterAsync",
targetNamespace = "http://apache.org/hello_world_async_soap_http")
-
+
public class GreeterImpl implements GreeterAsync {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeSometime(java.lang.String)
*/
@@ -50,12 +50,12 @@ public class GreeterImpl implements GreeterAsync {
System.out.println("Executing operation greetMeSometime synchronously\n");
return "How are you " + me;
}
-
- public Future<?> greetMeSometimeAsync(final String me,
+
+ public Future<?> greetMeSometimeAsync(final String me,
final AsyncHandler<GreetMeSometimeResponse> asyncHandler) {
LOG.info("Executing operation greetMeSometimeAsync asynchronously");
System.out.println("Executing operation greetMeSometimeAsync asynchronously\n");
- final ServerAsyncResponse<GreetMeSometimeResponse> r
+ final ServerAsyncResponse<GreetMeSometimeResponse> r
= new ServerAsyncResponse<GreetMeSometimeResponse>();
new Thread() {
public void run() {
@@ -66,14 +66,14 @@ public class GreeterImpl implements GreeterAsync {
asyncHandler.handleResponse(r);
}
} .start();
-
- return r;
+
+ return r;
}
-
+
public Response<GreetMeSometimeResponse> greetMeSometimeAsync(String requestType) {
- return null;
+ return null;
/*not called */
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
index 33041ef..ffb7f8b 100644
--- a/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_async/src/main/java/demo/hw/server/Server.java
@@ -32,12 +32,12 @@ public class Server {
String address = "http://localhost:9000/SoapContext/SoapPort";
Endpoint.publish(address, implementor);
}
-
+
public static void main(String args[]) throws Exception {
new Server();
- System.out.println("Server ready...");
-
- Thread.sleep(5 * 60 * 1000);
+ System.out.println("Server ready...");
+
+ Thread.sleep(5 * 60 * 1000);
System.out.println("Server exiting");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
index 63c7ef8..24e672d 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/client/Client.java
@@ -120,14 +120,14 @@ public final class Client {
DOMSource domRespPayload = dispDOMSrcPayload.invoke(domReqPayload);
System.out.println("Response from server: "
- + fetchElementByName(domRespPayload.getNode(),
+ + fetchElementByName(domRespPayload.getNode(),
"greetMeResponse").getTextContent());
System.exit(0);
}
private static Element fetchElementByName(Node parent, String name) {
- Element ret = null;
+ Element ret = null;
Node node = parent.getFirstChild();
while (node != null) {
if (node instanceof Element && ((Element)node).getLocalName().equals(name)) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
index d1163d8..9431382 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourceMessageProvider.java
@@ -29,7 +29,7 @@ import javax.xml.ws.ServiceMode;
import javax.xml.ws.WebServiceProvider;
@WebServiceProvider()
-@ServiceMode(value = Service.Mode.MESSAGE)
+@ServiceMode(value = Service.Mode.MESSAGE)
public class GreeterDOMSourceMessageProvider implements Provider<DOMSource> {
public GreeterDOMSourceMessageProvider() {
@@ -42,11 +42,11 @@ public class GreeterDOMSourceMessageProvider implements Provider<DOMSource> {
MessageFactory factory = MessageFactory.newInstance();
SOAPMessage soapReq = factory.createMessage();
soapReq.getSOAPPart().setContent(request);
-
+
System.out.println("Incoming Client Request as a DOMSource data in MESSAGE Mode");
soapReq.writeTo(System.out);
System.out.println("\n");
-
+
InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp2.xml");
SOAPMessage greetMeResponse = factory.createMessage(null, is);
is.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
index 5d6ba88..345f75f 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/GreeterDOMSourcePayloadProvider.java
@@ -47,11 +47,11 @@ public class GreeterDOMSourcePayloadProvider implements Provider<DOMSource> {
StreamResult result = new StreamResult(System.out);
transformer.transform(request, result);
System.out.println("\n");
-
+
InputStream is = getClass().getResourceAsStream("/GreetMeDocLiteralResp3.xml");
-
+
SOAPMessage greetMeResponse = MessageFactory.newInstance().createMessage(null, is);
- is.close();
+ is.close();
response.setNode(greetMeResponse.getSOAPBody().extractContentAsDocument());
} catch (Exception ex) {
ex.printStackTrace();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
index fc73d8c..92c9cd9 100644
--- a/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_dispatch_provider/src/main/java/demo/hwDispatch/server/Server.java
@@ -29,16 +29,16 @@ public class Server {
Object implementor = new GreeterSoapMessageProvider();
String address = "http://localhost:9000/SoapContext/SoapPort1";
Endpoint.publish(address, implementor);
-
+
System.out.println("Starting SoapService2");
implementor = new GreeterDOMSourceMessageProvider();
address = "http://localhost:9000/SoapContext/SoapPort2";
Endpoint.publish(address, implementor);
-
+
System.out.println("Starting SoapService3");
implementor = new GreeterDOMSourcePayloadProvider();
address = "http://localhost:9000/SoapContext/SoapPort3";
- Endpoint.publish(address, implementor);
+ Endpoint.publish(address, implementor);
}
public static void main(String args[]) throws Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
index 5ccbdf5..cd9d017 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/common/SmallNumberHandler.java
@@ -77,20 +77,20 @@ public class SmallNumberHandler implements LogicalHandler<LogicalMessageContext>
//System.out.printf("SmallNumberHandler addNumbers(%d, %d) == %d\n", a, b, answer);
// ok, we've done the calculation, so build the
// response and set it as the payload of the message
-
+
AddNumbersResponse resp = new AddNumbersResponse();
resp.setReturn(answer);
msg.setPayload(new ObjectFactory().createAddNumbersResponse(resp),
jaxbContext);
-
- Source src = msg.getPayload();
+
+ Source src = msg.getPayload();
msg.setPayload(src);
-
+
payload = msg.getPayload(jaxbContext);
if (payload instanceof JAXBElement) {
payload = ((JAXBElement)payload).getValue();
}
-
+
AddNumbersResponse resp2 = (AddNumbersResponse)payload;
if (resp2 == resp) {
throw new WebServiceException("Shouldn't be the same object");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
index 0b6c3ef..dbddb5e 100644
--- a/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
+++ b/distribution/src/main/release/samples/jaxws_handlers/src/main/java/demo/handlers/server/Server.java
@@ -34,9 +34,9 @@ public class Server {
public static void main(String args[]) throws Exception {
new Server();
- System.out.println("Server ready...");
-
- Thread.sleep(5 * 60 * 1000);
+ System.out.println("Server ready...");
+
+ Thread.sleep(5 * 60 * 1000);
System.out.println("Server exiting");
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
index 15ea971..361b067 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/SampleWsApplicationClient.java
@@ -26,7 +26,7 @@ import javax.xml.transform.stream.StreamSource;
//CHECKSTYLE:OFF
public class SampleWsApplicationClient {
-
+
public static void main(String[] args) {
String address = "http://localhost:8080/Service/Hello";
// final String request =
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
index e0872b4..1ea2242 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/Hello.java
@@ -34,12 +34,12 @@ import javax.xml.ws.ResponseWrapper;
public interface Hello {
@WebResult(name = "return", targetNamespace = "")
- @RequestWrapper(localName = "sayHello",
- targetNamespace = "http://service.ws.sample/",
+ @RequestWrapper(localName = "sayHello",
+ targetNamespace = "http://service.ws.sample/",
className = "sample.ws.service.SayHello")
@WebMethod(action = "urn:SayHello")
- @ResponseWrapper(localName = "sayHelloResponse",
- targetNamespace = "http://service.ws.sample/",
+ @ResponseWrapper(localName = "sayHelloResponse",
+ targetNamespace = "http://service.ws.sample/",
className = "sample.ws.service.SayHelloResponse")
String sayHello(@WebParam(name = "myname", targetNamespace = "") String myname);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
index b63fabc..416fbf2 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/main/java/sample/ws/service/HelloPortImpl.java
@@ -26,8 +26,8 @@ import java.util.logging.Logger;
* 3.1.0 2015-05-18T13:02:03.098-05:00 Generated source version: 3.1.0
*/
-@javax.jws.WebService(serviceName = "HelloService", portName = "HelloPort",
- targetNamespace = "http://service.ws.sample/",
+@javax.jws.WebService(serviceName = "HelloService", portName = "HelloPort",
+ targetNamespace = "http://service.ws.sample/",
endpointInterface = "sample.ws.service.Hello")
public class HelloPortImpl implements Hello {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java
index 0d5cce4..9131b4f 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/Book.java
@@ -21,7 +21,7 @@ package demo.jaxws.tracing.server;
public class Book {
private String id;
private String title;
-
+
public Book() {
}
@@ -33,7 +33,7 @@ public class Book {
public String getId() {
return id;
}
-
+
public void setId(String id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
index 4dd17c1..74e1f3a 100644
--- a/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
+++ b/distribution/src/main/release/samples/jaxws_tracing_brave_osgi/src/main/java/demo/jaxws/tracing/server/impl/CatalogServiceImpl.java
@@ -39,16 +39,16 @@ public class CatalogServiceImpl implements CatalogService {
private final ExecutorService executor = Executors.newFixedThreadPool(2);
private final Map<String, Book> books = new ConcurrentHashMap<>();
private final Brave brave;
-
+
public CatalogServiceImpl(final Brave brave) {
this.brave = brave;
}
-
+
@UseAsyncMethod
public void addBook(Book book) {
throw new UnsupportedOperationException("Please use async version of the method");
}
-
+
public Future<?> addBookAsync(Book book, AsyncHandler<Book> handler) {
final ServerAsyncResponse<Book> response = new ServerAsyncResponse<Book>();
@@ -61,21 +61,21 @@ public class CatalogServiceImpl implements CatalogService {
brave.localTracer().finishSpan();
}
});
-
+
return response;
}
@Override
public Book getBook(final String id) {
final Book book = books.get(id);
-
+
if (book == null) {
throw new RuntimeException("Book with does not exists: " + id);
}
-
+
return book;
}
-
+
@Override
public void delete(final String id) {
if (books.remove(id) == null) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
index 0bb601f..57fe6ce 100644
--- a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
+++ b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
@@ -21,7 +21,7 @@ package demo.jms_greeter.server;
import java.util.logging.Logger;
import org.apache.cxf.jms_greeter.JMSGreeterPortType;
-@javax.jws.WebService(portName = "GreeterPort",
+@javax.jws.WebService(portName = "GreeterPort",
serviceName = "JMSGreeterService",
targetNamespace = "http://cxf.apache.org/jms_greeter",
endpointInterface = "org.apache.cxf.jms_greeter.JMSGreeterPortType",
@@ -42,7 +42,7 @@ public class GreeterJMSImpl implements JMSGreeterPortType {
System.out.println("Executing operation sayHi" + "\n");
return "Bonjour";
}
-
+
public void greetMeOneWay(String me) {
LOG.info("Executing operation greetMeOneWay");
System.out.println("Executing operation greetMeOneWay\n");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
index e5cac8a..4786b6f 100644
--- a/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
+++ b/distribution/src/main/release/samples/jms_queue/src/main/java/demo/jms_greeter/server/Server.java
@@ -34,7 +34,7 @@ public class Server {
System.out.println("Starting Server");
Object implementor = new GreeterJMSImpl();
ep = Endpoint.publish(null, implementor);
-
+
Runtime.getRuntime().addShutdownHook(new Thread() {
public void run() {
shutdown();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java b/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
index 0bb601f..57fe6ce 100644
--- a/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
+++ b/distribution/src/main/release/samples/jms_spec_demo/src/main/java/demo/jms_greeter/server/GreeterJMSImpl.java
@@ -21,7 +21,7 @@ package demo.jms_greeter.server;
import java.util.logging.Logger;
import org.apache.cxf.jms_greeter.JMSGreeterPortType;
-@javax.jws.WebService(portName = "GreeterPort",
+@javax.jws.WebService(portName = "GreeterPort",
serviceName = "JMSGreeterService",
targetNamespace = "http://cxf.apache.org/jms_greeter",
endpointInterface = "org.apache.cxf.jms_greeter.JMSGreeterPortType",
@@ -42,7 +42,7 @@ public class GreeterJMSImpl implements JMSGreeterPortType {
System.out.println("Executing operation sayHi" + "\n");
return "Bonjour";
}
-
+
public void greetMeOneWay(String me) {
LOG.info("Executing operation greetMeOneWay");
System.out.println("Executing operation greetMeOneWay\n");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
index 451e013..10c1277 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceSpringClient.java
@@ -21,17 +21,17 @@ package com.example.customerservice.client;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
- * Starter that initializes the spring context, fetches our test client and then shuts down spring
+ * Starter that initializes the spring context, fetches our test client and then shuts down spring
*/
public final class CustomerServiceSpringClient {
private CustomerServiceSpringClient() {
}
- public static void main(String args[]) throws Exception {
- ClassPathXmlApplicationContext context
+ public static void main(String args[]) throws Exception {
+ ClassPathXmlApplicationContext context
= new ClassPathXmlApplicationContext(new String[] {"classpath:client-applicationContext.xml"});
CustomerServiceTester client = (CustomerServiceTester)context.getBean("tester");
-
+
client.testCustomerService();
context.close();
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
index 818992c..feaa2ff 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/client/CustomerServiceTester.java
@@ -29,18 +29,18 @@ import org.junit.Assert;
/**
- * Calls the CustomerService using the proxy created by CXF and does some assertions to make
+ * Calls the CustomerService using the proxy created by CXF and does some assertions to make
* sure the calls work.
- *
- * This also shows how typical user code on the client side
+ *
+ * This also shows how typical user code on the client side
* could look like. Make sure to keep your business code
* free from spring and cxf dependencies as far as possible.
*/
public final class CustomerServiceTester {
-
- // The CustomerService proxy will be injected either by spring or by a direct call to the setter
+
+ // The CustomerService proxy will be injected either by spring or by a direct call to the setter
CustomerService customerService;
-
+
public CustomerService getCustomerService() {
return customerService;
}
@@ -51,7 +51,7 @@ public final class CustomerServiceTester {
public void testCustomerService() throws NoSuchCustomerException {
List<Customer> customers = null;
-
+
// First we test the positive case where customers are found and we retreive
// a list of customers
System.out.println("Sending request for customers named Smith");
@@ -59,7 +59,7 @@ public final class CustomerServiceTester {
System.out.println("Response received");
Assert.assertEquals(2, customers.size());
Assert.assertEquals("Smith", customers.get(0).getName());
-
+
// Then we test for an unknown Customer name and expect the NoSuchCustomerException
try {
customers = customerService.getCustomersByName("None");
@@ -70,14 +70,14 @@ public final class CustomerServiceTester {
Assert.assertEquals("None", e.getFaultInfo().getCustomerName());
System.out.println("NoSuchCustomer exception was received as expected");
}
-
- // The implementation of updateCustomer is set to sleep for some seconds.
+
+ // The implementation of updateCustomer is set to sleep for some seconds.
// Still this method should return instantly as the method is declared
// as a one way method in the WSDL
Customer customer = new Customer();
customer.setName("Smith");
customerService.updateCustomer(customer);
-
+
System.out.println("All calls were successful");
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
index f2e91c0..eac3ea7 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceImpl.java
@@ -34,9 +34,9 @@ import com.example.customerservice.NoSuchCustomer;
import com.example.customerservice.NoSuchCustomerException;
public class CustomerServiceImpl implements CustomerService {
-
+
/**
- * The WebServiceContext can be used to retrieve special attributes like the
+ * The WebServiceContext can be used to retrieve special attributes like the
* user principal. Normally it is not needed
*/
@Resource
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
index f7e4af9..73f5497 100644
--- a/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
+++ b/distribution/src/main/release/samples/jms_spring_config/src/main/java/com/example/customerservice/server/CustomerServiceSpringServer.java
@@ -26,7 +26,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public final class CustomerServiceSpringServer {
private CustomerServiceSpringServer() {
}
-
+
public static void main(String args[]) throws Exception {
ClassPathXmlApplicationContext ctx
= new ClassPathXmlApplicationContext("server-applicationContext.xml");
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java
index 1acd14e..d4bf5be 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/JavascriptExampleImpl.java
@@ -30,9 +30,9 @@ import demo.hw.server.data.Ingredient;
@WebService(endpointInterface = "demo.hw.server.JavascriptExample")
public class JavascriptExampleImpl implements JavascriptExample {
-
+
private List<Beverage> beverages;
-
+
public JavascriptExampleImpl() {
beverages = new ArrayList<>();
Ingredient calcium = new Ingredient();
@@ -47,7 +47,7 @@ public class JavascriptExampleImpl implements JavascriptExample {
Ingredient apple = new Ingredient();
apple.setName("apple");
apple.setCategory(Category.Fruit);
-
+
Beverage b = new Beverage();
b.setName("zinc-fortified broccoli shake");
b.setProof(20);
@@ -57,7 +57,7 @@ public class JavascriptExampleImpl implements JavascriptExample {
ingredients[1] = broccoli;
b.setIngredients(ingredients);
beverages.add(b);
-
+
b = new Beverage();
b.setName("apple broccoli shake");
b.setProof(50);
@@ -66,7 +66,7 @@ public class JavascriptExampleImpl implements JavascriptExample {
ingredients[1] = broccoli;
b.setIngredients(ingredients);
beverages.add(b);
-
+
b = new Beverage();
b.setName("calcium-fortified apple juice");
b.setProof(13);
@@ -75,7 +75,7 @@ public class JavascriptExampleImpl implements JavascriptExample {
ingredients[1] = calcium;
b.setIngredients(ingredients);
beverages.add(b);
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java
index c75dd38..cf0bbc1 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Beverage.java
@@ -19,11 +19,11 @@
package demo.hw.server.data;
public class Beverage {
-
+
private String name;
private Ingredient[] ingredients;
private int proof;
-
+
public String getName() {
return name;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java
index 2a606a8..ac53138 100644
--- a/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java
+++ b/distribution/src/main/release/samples/js_browser_client_java_first/src/main/java/demo/hw/server/data/Ingredient.java
@@ -20,7 +20,7 @@ package demo.hw.server.data;
public class Ingredient {
private String name;
- private Category category;
+ private Category category;
@Override
public boolean equals(Object obj) {
@@ -31,8 +31,8 @@ public class Ingredient {
return false;
}
}
-
-
+
+
public String getName() {
return name;
}
@@ -45,7 +45,7 @@ public class Ingredient {
public void setCategory(Category category) {
this.category = category;
}
-
+
@Override
public int hashCode() {
return name.hashCode() + (37 * category.hashCode());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
index bc22c4c..b9fbb88 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Client.java
@@ -30,18 +30,18 @@ import org.apache.hello_world_soap_http.types.FaultDetail;
public final class Client {
- private static final QName SERVICE_NAME
+ private static final QName SERVICE_NAME
= new QName("http://apache.org/hello_world_soap_http", "SOAPService");
private Client() {
- }
+ }
public static void main(String args[]) throws Exception {
-
- if (args.length == 0) {
+
+ if (args.length == 0) {
System.out.println("please specify wsdl");
- System.exit(1);
+ System.exit(1);
}
URL wsdlURL;
@@ -51,11 +51,11 @@ public final class Client {
} else {
wsdlURL = new URL(args[0]);
}
-
+
System.out.println(wsdlURL);
SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME);
Greeter port = ss.getSoapPort();
- String resp;
+ String resp;
System.out.println("Invoking sayHi...");
resp = port.sayHi();
@@ -89,9 +89,9 @@ public final class Client {
System.out.println("Expected exception: PingMeFault has occurred: " + ex.getMessage());
FaultDetail detail = ex.getFaultInfo();
System.out.println("FaultDetail major:" + detail.getMajor());
- System.out.println("FaultDetail minor:" + detail.getMinor());
- }
- System.exit(0);
+ System.out.println("FaultDetail minor:" + detail.getMinor());
+ }
+ System.exit(0);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
index e47fdf5..cf46a24 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/client/Get.java
@@ -35,7 +35,7 @@ import javax.xml.transform.stream.StreamSource;
public final class Get {
private Get() {
- }
+ }
public static void main(String args[]) throws Exception {
// Sent HTTP GET request to invoke sayHi
@@ -115,5 +115,5 @@ public final class Get {
} catch (Exception e) {
e.printStackTrace();
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java
index 3f97ff4..5b094f5 100644
--- a/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/js_browser_client_simple/src/main/java/demo/hw/server/GreeterImpl.java
@@ -24,17 +24,17 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
endpointInterface = "org.apache.hello_world_soap_http.Greeter")
-
+
public class GreeterImpl implements Greeter {
-
- private static final Logger LOG =
+
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
private int sayHiCounter;
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -44,7 +44,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
@@ -62,7 +62,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Executing operation sayHi\n");
return "Bonjour " + (++sayHiCounter);
}
-
+
public void pingMe() throws PingMeFault {
FaultDetail faultDetail = new FaultDetail();
faultDetail.setMajor((short)2);
@@ -72,5 +72,5 @@ public class GreeterImpl implements Greeter {
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java b/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java
index ca0afd6..3616cec 100644
--- a/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java
+++ b/distribution/src/main/release/samples/js_client/src/main/java/demo/hw/server/GreeterImpl.java
@@ -24,15 +24,15 @@ import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.PingMeFault;
import org.apache.hello_world_soap_http.types.FaultDetail;
-@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
- targetNamespace = "http://apache.org/hello_world_soap_http",
+@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
+ targetNamespace = "http://apache.org/hello_world_soap_http",
endpointInterface = "org.apache.hello_world_soap_http.Greeter")
-
+
public class GreeterImpl implements Greeter {
- private static final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
*/
@@ -42,7 +42,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Message received: " + me + "\n");
return "Hello " + me;
}
-
+
/* (non-Javadoc)
* @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
*/
@@ -60,7 +60,7 @@ public class GreeterImpl implements Greeter {
System.out.println("Executing operation sayHi\n");
return "Bonjour";
}
-
+
public void pingMe() throws PingMeFault {
FaultDetail faultDetail = new FaultDetail();
faultDetail.setMajor((short)2);
@@ -70,5 +70,5 @@ public class GreeterImpl implements Greeter {
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
index d886b9b..3d57c8e 100644
--- a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
+++ b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/Server.java
@@ -30,8 +30,8 @@ public class Server {
Object implementor = new TestMtomPortTypeImpl();
String address = "http://localhost:9000/mime-test";
Endpoint ep = Endpoint.publish(address, implementor);
- Binding binding = ep.getBinding();
- ((SOAPBinding)binding).setMTOMEnabled(true);
+ Binding binding = ep.getBinding();
+ ((SOAPBinding)binding).setMTOMEnabled(true);
}
public static void main(String args[]) throws Exception {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java
index 24713b1..49f4b44 100644
--- a/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java
+++ b/distribution/src/main/release/samples/mtom/src/main/java/demo/mtom/server/TestMtomPortTypeImpl.java
@@ -40,8 +40,8 @@ public class TestMtomPortTypeImpl implements TestMtomPortType {
public void testByteArray(Holder<String> name, Holder<byte[]> attachinfo) {
System.out.println("Received image from client");
- System.out.println("The image data size is " + attachinfo.value.length);
- name.value = "Hello " + name.value;
+ System.out.println("The image data size is " + attachinfo.value.length);
+ name.value = "Hello " + name.value;
}
public void testDataHandler(Holder<String> name, Holder<DataHandler> attachinfo) {
@@ -71,6 +71,6 @@ public class TestMtomPortTypeImpl implements TestMtomPortType {
}
return total;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
index 1e275fb..7b5ec25 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/GetProtectedResourceController.java
@@ -61,7 +61,7 @@ public class GetProtectedResourceController {
provider);
OAuthAccessor accessor = new OAuthAccessor(consumer);
accessor.requestToken = oAuthParams.getOauthToken();
- accessor.tokenSecret = oAuthParams.getOauthTokenSecret();
+ accessor.tokenSecret = oAuthParams.getOauthTokenSecret();
Map<String, String> parameters = new HashMap<String, String>();
parameters.put(OAuth.OAUTH_SIGNATURE_METHOD, oAuthParams.getSignatureMethod());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
index 36786f3..03734f7 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TemporaryCredentialsController.java
@@ -96,7 +96,7 @@ public class TemporaryCredentialsController {
oAuthParams.setOauthTokenSecret(accessor.tokenSecret);
Cookie cId = new Cookie("clientID", oAuthParams.getClientID());
Cookie cSec = new Cookie("clientSecret", oAuthParams.getClientSecret());
- Cookie tokenSec = new Cookie("tokenSec", accessor.tokenSecret);
+ Cookie tokenSec = new Cookie("tokenSec", accessor.tokenSecret);
response.addCookie(cId);
response.addCookie(cSec);
response.addCookie(tokenSec);
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
index 7e67bf3..a66bec5 100644
--- a/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
+++ b/distribution/src/main/release/samples/oauth/client/src/main/java/demo/oauth/client/controllers/TokenRequestController.java
@@ -82,7 +82,7 @@ public class TokenRequestController {
OAuthAccessor accessor = new OAuthAccessor(consumer);
accessor.requestToken = oauthToken;
accessor.tokenSecret = Common.findCookieValue(request, "tokenSec");
-
+
Map<String, String> parameters = new HashMap<String, String>();
parameters.put(OAuth.OAUTH_SIGNATURE_METHOD, oAuthParams.getSignatureMethod());
parameters.put(OAuth.OAUTH_NONCE, UUID.randomUUID().toString());
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java
index 7a485a3..6431063 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/CustomAuth.java
@@ -31,7 +31,7 @@ public class CustomAuth extends LoginUrlAuthenticationEntryPoint {
public CustomAuth(String v) {
super(v);
}
-
+
@Override
public void commence(HttpServletRequest request, HttpServletResponse response,
AuthenticationException authException) throws IOException, ServletException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
index e49eb37..e81529b 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/ApplicationController.java
@@ -74,7 +74,7 @@ public class ApplicationController implements ServletContextAware {
String secretKey = tokenGen.generate(new SecureRandom().generateSeed(20));
- Client clientInfo =
+ Client clientInfo =
new Client(consumerKey, secretKey, clientApp.getClientName(), null);
clientInfo.setCallbackURI(clientApp.getCallbackURL());
clientInfo.setLoginName(principal.getName());
@@ -124,7 +124,7 @@ public class ApplicationController implements ServletContextAware {
@RequestMapping("/revokeAccess")
public ModelAndView revokeAccess(HttpServletRequest request) {
String consumerKey = request.getParameter("consumerKey");
-
+
clientManager.removeAllTokens(consumerKey);
ModelAndView modelAndView = new ModelAndView(new RedirectView("/app/listAuthorizedClients"));
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
index 6927aad..7da40ab 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/MemoryOAuthDataProvider.java
@@ -50,7 +50,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
public static final String CLIENT_ID = "12345678";
public static final String CLIENT_SECRET = "secret";
- private static final ConcurrentHashMap<String, OAuthPermission> AVAILABLE_PERMISSIONS =
+ private static final ConcurrentHashMap<String, OAuthPermission> AVAILABLE_PERMISSIONS =
new ConcurrentHashMap<String, OAuthPermission>();
static {
@@ -58,7 +58,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
.put("read_info", new OAuthPermission("read_info", "Read your personal information",
Collections.singletonList("ROLE_USER")));
AVAILABLE_PERMISSIONS.put("modify_info",
- new OAuthPermission("modify_info", "Modify your personal information",
+ new OAuthPermission("modify_info", "Modify your personal information",
Collections.singletonList("ROLE_ADMIN")));
}
@@ -76,17 +76,17 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
Client client = new Client(CLIENT_ID, CLIENT_SECRET, APPLICATION_NAME, CALLBACK);
clientAuthInfo.put(CLIENT_ID, client);
}
-
+
private List<OAuthPermission> getPermissionsInfo(List<String> requestPermissions) {
List<OAuthPermission> permissions = new ArrayList<>();
for (String requestScope : requestPermissions) {
OAuthPermission oAuthPermission = AVAILABLE_PERMISSIONS.get(requestScope);
permissions.add(oAuthPermission);
}
-
+
return permissions;
}
-
+
public Client getClient(String consumerKey) {
return clientAuthInfo.get(consumerKey);
}
@@ -95,7 +95,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
String token = generateToken();
String tokenSecret = generateToken();
- RequestToken reqToken = new RequestToken(reg.getClient(), token, tokenSecret,
+ RequestToken reqToken = new RequestToken(reg.getClient(), token, tokenSecret,
reg.getLifetime(), reg.getIssuedAt());
reqToken.setScopes(getPermissionsInfo(reg.getScopes()));
reqToken.setCallback(reg.getCallback());
@@ -134,7 +134,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
tokenSecretString, 3600, System.currentTimeMillis() / 1000);
accessToken.setScopes(requestToken.getScopes());
-
+
synchronized (oauthTokens) {
oauthTokens.remove(requestToken.getTokenKey());
oauthTokens.put(accessTokenString, accessToken);
@@ -155,7 +155,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
}
public void removeToken(Token t) {
-
+
for (Token token : oauthTokens.values()) {
Client authNInfo = token.getClient();
if (t.getClient().getConsumerKey().equals(authNInfo.getConsumerKey())) {
@@ -163,7 +163,7 @@ public class MemoryOAuthDataProvider implements OAuthDataProvider {
break;
}
}
-
+
}
protected String generateToken() throws OAuthServiceException {
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java
index 20a1797..4a69e87 100644
--- a/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java
+++ b/distribution/src/main/release/samples/oauth/server/src/main/java/demo/oauth/server/controllers/SampleOAuthDataProvider.java
@@ -58,7 +58,7 @@ public class SampleOAuthDataProvider extends MemoryOAuthDataProvider
}
return apps;
}
-
+
public synchronized void removeRegisteredClient(String consumerKey) {
List<String> registeredApps = this.userRegisteredClients.get(consumerKey);
this.clientAuthInfo.remove(consumerKey);
@@ -81,5 +81,5 @@ public class SampleOAuthDataProvider extends MemoryOAuthDataProvider
oauthTokens.remove(token.getTokenKey());
}
}
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/8cea7c87/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
index 758a268..65abf4b 100644
--- a/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
+++ b/distribution/src/main/release/samples/ruby_spring_support/src/main/java/demo/spring/client/Client.java
@@ -30,7 +30,7 @@ public final class Client {
public static void main(String args[]) throws Exception {
// START SNIPPET: client
- ClassPathXmlApplicationContext context
+ ClassPathXmlApplicationContext context
= new ClassPathXmlApplicationContext(new String[] {"client-beans.xml"});
HelloWorld client = (HelloWorld)context.getBean("client");