Repository: cxf Updated Branches: refs/heads/master 51ca25318 -> 481466c7a
less info logs in transports/websocket Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/481466c7 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/481466c7 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/481466c7 Branch: refs/heads/master Commit: 481466c7a42a57c87c992a02ab560be046bf5797 Parents: 51ca253 Author: Akitoshi Yoshida <[email protected]> Authored: Wed Aug 27 15:08:26 2014 +0200 Committer: Akitoshi Yoshida <[email protected]> Committed: Wed Aug 27 15:12:09 2014 +0200 ---------------------------------------------------------------------- .../WebSocketVirtualServletRequest.java | 132 +++++++++---------- .../WebSocketVirtualServletResponse.java | 114 ++++++++-------- .../websocket/ahc/AhcWebSocketConduit.java | 8 +- .../atmosphere/AtmosphereWebSocketHandler.java | 8 +- .../AtmosphereWebSocketStreamHandler.java | 2 +- .../websocket/jetty/JettyWebSocket.java | 10 +- 6 files changed, 137 insertions(+), 137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/481466c7/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java index b4fa397..aab03cd 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletRequest.java @@ -88,40 +88,40 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { @Override public Object getAttribute(String name) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "getAttribute({0}) -> {1}", new Object[] {name , attributes.get(name)}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "getAttribute({0}) -> {1}", new Object[] {name , attributes.get(name)}); } return attributes.get(name); } @Override public Enumeration<String> getAttributeNames() { - LOG.log(Level.INFO, "getAttributeNames()"); + LOG.log(Level.FINE, "getAttributeNames()"); return Collections.enumeration(attributes.keySet()); } @Override public String getCharacterEncoding() { // TODO Auto-generated method stub - LOG.log(Level.INFO, "getCharacterEncoding()"); + LOG.log(Level.FINE, "getCharacterEncoding()"); return null; } @Override public int getContentLength() { - LOG.log(Level.INFO, "getContentLength()"); + LOG.log(Level.FINE, "getContentLength()"); return 0; } @Override public String getContentType() { - LOG.log(Level.INFO, "getContentType()"); + LOG.log(Level.FINE, "getContentType()"); return requestHeaders.get("Content-Type"); } @Override public DispatcherType getDispatcherType() { - LOG.log(Level.INFO, "getDispatcherType()"); + LOG.log(Level.FINE, "getDispatcherType()"); return webSocketHolder.getDispatcherType(); } @@ -142,39 +142,39 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { @Override public String getLocalAddr() { - LOG.log(Level.INFO, "getLocalAddr()"); + LOG.log(Level.FINE, "getLocalAddr()"); return webSocketHolder.getLocalAddr(); } @Override public String getLocalName() { - LOG.log(Level.INFO, "getLocalName()"); + LOG.log(Level.FINE, "getLocalName()"); return webSocketHolder.getLocalName(); } @Override public int getLocalPort() { - LOG.log(Level.INFO, "getLocalPort()"); + LOG.log(Level.FINE, "getLocalPort()"); return webSocketHolder.getLocalPort(); } @Override public Locale getLocale() { - LOG.log(Level.INFO, "getLocale()"); + LOG.log(Level.FINE, "getLocale()"); return webSocketHolder.getLocale(); } @Override public Enumeration<Locale> getLocales() { - LOG.log(Level.INFO, "getLocales()"); + LOG.log(Level.FINE, "getLocales()"); return webSocketHolder.getLocales(); } @Override public String getParameter(String name) { // TODO Auto-generated method stub - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "getParameter({0})", name); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "getParameter({0})", name); } return null; } @@ -182,73 +182,73 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { @Override public Map<String, String[]> getParameterMap() { // TODO Auto-generated method stub - LOG.log(Level.INFO, "getParameterMap()"); + LOG.log(Level.FINE, "getParameterMap()"); return null; } @Override public Enumeration<String> getParameterNames() { // TODO Auto-generated method stub - LOG.log(Level.INFO, "getParameterNames()"); + LOG.log(Level.FINE, "getParameterNames()"); return null; } @Override public String[] getParameterValues(String name) { // TODO Auto-generated method stub - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "getParameterValues({0})", name); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "getParameterValues({0})", name); } return null; } @Override public String getProtocol() { - LOG.log(Level.INFO, "getProtocol"); + LOG.log(Level.FINE, "getProtocol"); return webSocketHolder.getProtocol(); } @Override public BufferedReader getReader() throws IOException { - LOG.log(Level.INFO, "getReader"); + LOG.log(Level.FINE, "getReader"); return new BufferedReader(new InputStreamReader(in, "utf-8")); } @Override public String getRealPath(String path) { // TODO Auto-generated method stub - LOG.log(Level.INFO, "getRealPath"); + LOG.log(Level.FINE, "getRealPath"); return null; } @Override public String getRemoteAddr() { - LOG.log(Level.INFO, "getRemoteAddr"); + LOG.log(Level.FINE, "getRemoteAddr"); return webSocketHolder.getRemoteAddr(); } @Override public String getRemoteHost() { - LOG.log(Level.INFO, "getRemoteHost"); + LOG.log(Level.FINE, "getRemoteHost"); return webSocketHolder.getRemoteHost(); } @Override public int getRemotePort() { - LOG.log(Level.INFO, "getRemotePort"); + LOG.log(Level.FINE, "getRemotePort"); return webSocketHolder.getRemotePort(); } @Override public RequestDispatcher getRequestDispatcher(String path) { // TODO Auto-generated method stub - LOG.log(Level.INFO, "getRequestDispatcher"); + LOG.log(Level.FINE, "getRequestDispatcher"); return null; } @Override public String getScheme() { - LOG.log(Level.INFO, "getScheme"); + LOG.log(Level.FINE, "getScheme"); return webSocketHolder.getScheme(); } @@ -259,137 +259,137 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { @Override public int getServerPort() { - LOG.log(Level.INFO, "getServerPort"); + LOG.log(Level.FINE, "getServerPort"); return webSocketHolder.getServerPort(); } @Override public ServletContext getServletContext() { - LOG.log(Level.INFO, "getServletContext"); + LOG.log(Level.FINE, "getServletContext"); return webSocketHolder.getServletContext(); } @Override public boolean isAsyncStarted() { - LOG.log(Level.INFO, "isAsyncStarted"); + LOG.log(Level.FINE, "isAsyncStarted"); return false; } @Override public boolean isAsyncSupported() { - LOG.log(Level.INFO, "isAsyncSupported"); + LOG.log(Level.FINE, "isAsyncSupported"); return false; } @Override public boolean isSecure() { - LOG.log(Level.INFO, "isSecure"); + LOG.log(Level.FINE, "isSecure"); return webSocketHolder.isSecure(); } @Override public void removeAttribute(String name) { - LOG.log(Level.INFO, "removeAttribute"); + LOG.log(Level.FINE, "removeAttribute"); attributes.remove(name); } @Override public void setAttribute(String name, Object o) { - LOG.log(Level.INFO, "setAttribute"); + LOG.log(Level.FINE, "setAttribute"); attributes.put(name, o); } @Override public void setCharacterEncoding(String env) throws UnsupportedEncodingException { - LOG.log(Level.INFO, "setCharacterEncoding"); + LOG.log(Level.FINE, "setCharacterEncoding"); // ignore as we stick to utf-8. } @Override public AsyncContext startAsync() { - LOG.log(Level.INFO, "startAsync"); + LOG.log(Level.FINE, "startAsync"); return null; } @Override public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse) { // TODO Auto-generated method stub - LOG.log(Level.INFO, "startAsync"); + LOG.log(Level.FINE, "startAsync"); return null; } @Override public boolean authenticate(HttpServletResponse servletResponse) throws IOException, ServletException { // TODO Auto-generated method stub - LOG.log(Level.INFO, "authenticate"); + LOG.log(Level.FINE, "authenticate"); return false; } @Override public String getAuthType() { - LOG.log(Level.INFO, "getAuthType"); + LOG.log(Level.FINE, "getAuthType"); return webSocketHolder.getAuthType(); } @Override public String getContextPath() { - LOG.log(Level.INFO, "getContextPath -> " + webSocketHolder.getContextPath()); + LOG.log(Level.FINE, "getContextPath -> " + webSocketHolder.getContextPath()); return webSocketHolder.getContextPath(); } @Override public Cookie[] getCookies() { - LOG.log(Level.INFO, "getCookies"); + LOG.log(Level.FINE, "getCookies"); return null; } @Override public long getDateHeader(String name) { - LOG.log(Level.INFO, "getDateHeader"); + LOG.log(Level.FINE, "getDateHeader"); return 0; } @Override public String getHeader(String name) { - LOG.log(Level.INFO, "getHeader"); + LOG.log(Level.FINE, "getHeader"); return requestHeaders.get(name); } @Override public Enumeration<String> getHeaderNames() { - LOG.log(Level.INFO, "getHeaderNames"); + LOG.log(Level.FINE, "getHeaderNames"); return Collections.enumeration(requestHeaders.keySet()); } @Override public Enumeration<String> getHeaders(String name) { - LOG.log(Level.INFO, "getHeaders"); + LOG.log(Level.FINE, "getHeaders"); // our protocol assumes no multiple headers return Collections.enumeration(Arrays.asList(requestHeaders.get(name))); } @Override public int getIntHeader(String name) { - LOG.log(Level.INFO, "getIntHeader"); + LOG.log(Level.FINE, "getIntHeader"); String v = requestHeaders.get(name); return v == null ? -1 : Integer.parseInt(v); } @Override public String getMethod() { - LOG.log(Level.INFO, "getMethod"); + LOG.log(Level.FINE, "getMethod"); return requestHeaders.get(WebSocketUtils.METHOD_KEY); } @Override public Part getPart(String name) throws IOException, ServletException { - LOG.log(Level.INFO, "getPart"); + LOG.log(Level.FINE, "getPart"); return null; } @Override public Collection<Part> getParts() throws IOException, ServletException { - LOG.log(Level.INFO, "getParts"); + LOG.log(Level.FINE, "getParts"); return null; } @@ -397,7 +397,7 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { public String getPathInfo() { String uri = requestHeaders.get(WebSocketUtils.URI_KEY); String servletpath = webSocketHolder.getServletPath(); - LOG.log(Level.INFO, "getPathInfo " + servletpath + " " + uri); + LOG.log(Level.FINE, "getPathInfo " + servletpath + " " + uri); //TODO remove the query string part //REVISIT may cache this value in requstHeaders? return uri.substring(servletpath.length()); @@ -412,7 +412,7 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { return null; } String opathinfo = webSocketHolder.getPathInfo(); - LOG.log(Level.INFO, "getPathTranslated " + path + " " + opathinfo); + LOG.log(Level.FINE, "getPathTranslated " + path + " " + opathinfo); int pos = opathtrans.indexOf(opathinfo); //REVISIT may cache this value in requstHeaders? return new StringBuilder().append(opathtrans.substring(0, pos)).append(path).toString(); @@ -420,19 +420,19 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { @Override public String getQueryString() { - LOG.log(Level.INFO, "getQueryString"); + LOG.log(Level.FINE, "getQueryString"); return null; } @Override public String getRemoteUser() { - LOG.log(Level.INFO, "getRemoteUser"); + LOG.log(Level.FINE, "getRemoteUser"); return null; } @Override public String getRequestURI() { - LOG.log(Level.INFO, "getRequestURI " + requestHeaders.get(WebSocketUtils.URI_KEY)); + LOG.log(Level.FINE, "getRequestURI " + requestHeaders.get(WebSocketUtils.URI_KEY)); return requestHeaders.get(WebSocketUtils.URI_KEY); } @@ -442,78 +442,78 @@ public class WebSocketVirtualServletRequest implements HttpServletRequest { String ouri = webSocketHolder.getRequestURI(); String uri = getRequestURI(); sb.append(uri.substring(ouri.length())); - LOG.log(Level.INFO, "getRequestURL " + uri); + LOG.log(Level.FINE, "getRequestURL " + uri); return sb; } @Override public String getRequestedSessionId() { - LOG.log(Level.INFO, "getRequestedSessionId"); + LOG.log(Level.FINE, "getRequestedSessionId"); return null; } @Override public String getServletPath() { - LOG.log(Level.INFO, "getServletPath " + webSocketHolder.getServletPath()); + LOG.log(Level.FINE, "getServletPath " + webSocketHolder.getServletPath()); return webSocketHolder.getServletPath(); } @Override public HttpSession getSession() { - LOG.log(Level.INFO, "getSession"); + LOG.log(Level.FINE, "getSession"); return null; } @Override public HttpSession getSession(boolean create) { - LOG.log(Level.INFO, "getSession"); + LOG.log(Level.FINE, "getSession"); return null; } @Override public Principal getUserPrincipal() { - LOG.log(Level.INFO, "getUserPrincipal"); + LOG.log(Level.FINE, "getUserPrincipal"); return webSocketHolder.getUserPrincipal(); } @Override public boolean isRequestedSessionIdFromCookie() { - LOG.log(Level.INFO, "isRequestedSessionIdFromCookie"); + LOG.log(Level.FINE, "isRequestedSessionIdFromCookie"); return false; } @Override public boolean isRequestedSessionIdFromURL() { - LOG.log(Level.INFO, "isRequestedSessionIdFromURL"); + LOG.log(Level.FINE, "isRequestedSessionIdFromURL"); return false; } @Override public boolean isRequestedSessionIdFromUrl() { - LOG.log(Level.INFO, "isRequestedSessionIdFromUrl"); + LOG.log(Level.FINE, "isRequestedSessionIdFromUrl"); return false; } @Override public boolean isRequestedSessionIdValid() { - LOG.log(Level.INFO, "isRequestedSessionIdValid"); + LOG.log(Level.FINE, "isRequestedSessionIdValid"); return false; } @Override public boolean isUserInRole(String role) { - LOG.log(Level.INFO, "isUserInRole"); + LOG.log(Level.FINE, "isUserInRole"); return false; } @Override public void login(String username, String password) throws ServletException { - LOG.log(Level.INFO, "login"); + LOG.log(Level.FINE, "login"); } @Override public void logout() throws ServletException { - LOG.log(Level.INFO, "logout"); + LOG.log(Level.FINE, "logout"); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/481466c7/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletResponse.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletResponse.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletResponse.java index 07e2efb..e9fccbf 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletResponse.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/WebSocketVirtualServletResponse.java @@ -52,31 +52,31 @@ public class WebSocketVirtualServletResponse implements HttpServletResponse { @Override public void flushBuffer() throws IOException { - LOG.log(Level.INFO, "flushBuffer()"); + LOG.log(Level.FINE, "flushBuffer()"); outputStream.flush(); } @Override public int getBufferSize() { - LOG.log(Level.INFO, "getBufferSize()"); + LOG.log(Level.FINE, "getBufferSize()"); return 0; } @Override public String getCharacterEncoding() { - LOG.log(Level.INFO, "getCharacterEncoding()"); + LOG.log(Level.FINE, "getCharacterEncoding()"); return null; } @Override public String getContentType() { - LOG.log(Level.INFO, "getContentType()"); + LOG.log(Level.FINE, "getContentType()"); return responseHeaders.get("Content-Type"); } @Override public Locale getLocale() { - LOG.log(Level.INFO, "getLocale"); + LOG.log(Level.FINE, "getLocale"); return null; } @@ -87,7 +87,7 @@ public class WebSocketVirtualServletResponse implements HttpServletResponse { @Override public PrintWriter getWriter() throws IOException { - LOG.log(Level.INFO, "getWriter()"); + LOG.log(Level.FINE, "getWriter()"); return new PrintWriter(getOutputStream()); } @@ -102,151 +102,151 @@ public class WebSocketVirtualServletResponse implements HttpServletResponse { @Override public void resetBuffer() { - LOG.log(Level.INFO, "resetBuffer()"); + LOG.log(Level.FINE, "resetBuffer()"); } @Override public void setBufferSize(int size) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setBufferSize({0})", size); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setBufferSize({0})", size); } } @Override public void setCharacterEncoding(String charset) { // TODO - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setCharacterEncoding({0})", charset); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setCharacterEncoding({0})", charset); } } @Override public void setContentLength(int len) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setContentLength({0})", len); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setContentLength({0})", len); } responseHeaders.put("Content-Length", Integer.toString(len)); } @Override public void setContentType(String type) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setContentType({0})", type); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setContentType({0})", type); } responseHeaders.put("Content-Type", type); } @Override public void setLocale(Locale loc) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setLocale({0})", loc); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setLocale({0})", loc); } } @Override public void addCookie(Cookie cookie) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "addCookie({0})", cookie); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "addCookie({0})", cookie); } } @Override public void addDateHeader(String name, long date) { // TODO - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "addDateHeader({0}, {1})", new Object[]{name, date}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "addDateHeader({0}, {1})", new Object[]{name, date}); } } @Override public void addHeader(String name, String value) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "addHeader({0}, {1})", new Object[]{name, value}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "addHeader({0}, {1})", new Object[]{name, value}); } responseHeaders.put(name, value); } @Override public void addIntHeader(String name, int value) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "addIntHeader({0}, {1})", new Object[]{name, value}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "addIntHeader({0}, {1})", new Object[]{name, value}); } responseHeaders.put(name, Integer.toString(value)); } @Override public boolean containsHeader(String name) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "containsHeader({0})", name); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "containsHeader({0})", name); } return responseHeaders.containsKey(name); } @Override public String encodeRedirectURL(String url) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "encodeRedirectURL({0})", url); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "encodeRedirectURL({0})", url); } return null; } @Override public String encodeRedirectUrl(String url) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "encodeRedirectUrl({0})", url); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "encodeRedirectUrl({0})", url); } return null; } @Override public String encodeURL(String url) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "encodeURL({0})", url); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "encodeURL({0})", url); } return null; } @Override public String encodeUrl(String url) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "encodeUrl({0})", url); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "encodeUrl({0})", url); } return null; } @Override public String getHeader(String name) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "getHeader({0})", name); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "getHeader({0})", name); } return null; } @Override public Collection<String> getHeaderNames() { - LOG.log(Level.INFO, "getHeaderNames()"); + LOG.log(Level.FINE, "getHeaderNames()"); return null; } @Override public Collection<String> getHeaders(String name) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "getHeaders({0})", name); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "getHeaders({0})", name); } return null; } @Override public int getStatus() { - LOG.log(Level.INFO, "getStatus()"); + LOG.log(Level.FINE, "getStatus()"); String v = responseHeaders.get(WebSocketUtils.SC_KEY); return v == null ? 200 : Integer.parseInt(v); } @Override public void sendError(int sc) throws IOException { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "sendError{0}", sc); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "sendError{0}", sc); } responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc)); byte[] data = WebSocketUtils.buildResponse(responseHeaders, null, 0, 0); @@ -255,8 +255,8 @@ public class WebSocketVirtualServletResponse implements HttpServletResponse { @Override public void sendError(int sc, String msg) throws IOException { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "sendError({0}, {1})", new Object[]{sc, msg}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "sendError({0}, {1})", new Object[]{sc, msg}); } responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc)); responseHeaders.put(WebSocketUtils.SM_KEY, msg); @@ -266,46 +266,46 @@ public class WebSocketVirtualServletResponse implements HttpServletResponse { @Override public void sendRedirect(String location) throws IOException { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "sendRedirect({0})", location); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "sendRedirect({0})", location); } } @Override public void setDateHeader(String name, long date) { // ignore - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setDateHeader({0}, {1})", new Object[]{name, date}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setDateHeader({0}, {1})", new Object[]{name, date}); } } @Override public void setHeader(String name, String value) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setHeader({0}, {1})", new Object[]{name, value}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setHeader({0}, {1})", new Object[]{name, value}); } responseHeaders.put(name, value); } @Override public void setIntHeader(String name, int value) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setIntHeader({0}, {1})", new Object[]{name, value}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setIntHeader({0}, {1})", new Object[]{name, value}); } } @Override public void setStatus(int sc) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setStatus({0})", sc); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setStatus({0})", sc); } responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc)); } @Override public void setStatus(int sc, String sm) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "setStatus({0}, {1})", new Object[]{sc, sm}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "setStatus({0}, {1})", new Object[]{sc, sm}); } responseHeaders.put(WebSocketUtils.SC_KEY, Integer.toString(sc)); responseHeaders.put(WebSocketUtils.SM_KEY, sm); http://git-wip-us.apache.org/repos/asf/cxf/blob/481466c7/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java index 612d986..3bfb4ed 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/ahc/AhcWebSocketConduit.java @@ -325,8 +325,8 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit { } public void onMessage(byte[] message) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "onMessage({0})", message); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "onMessage({0})", message); } Response resp = new Response(responseIdKey, message); RequestResponse rr = uncorrelatedRequests.get(resp.getId()); @@ -344,8 +344,8 @@ public class AhcWebSocketConduit extends URLConnectionHTTPConduit { } public void onMessage(String message) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "onMessage({0})", message); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "onMessage({0})", message); } Response resp = new Response(responseIdKey, message); RequestResponse rr = uncorrelatedRequests.get(resp.getId()); http://git-wip-us.apache.org/repos/asf/cxf/blob/481466c7/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java index ee4e358..791fa66 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketHandler.java @@ -71,14 +71,14 @@ public class AtmosphereWebSocketHandler implements WebSocketProtocol { /** {@inheritDoc}*/ @Override public void configure(AtmosphereConfig config) { - LOG.info("configure(AtmosphereConfig)"); + LOG.fine("configure(AtmosphereConfig)"); } /** {@inheritDoc}*/ @Override public List<AtmosphereRequest> onMessage(WebSocket webSocket, String data) { - LOG.info("onMessage(WebSocket, String)"); + LOG.fine("onMessage(WebSocket, String)"); //TODO may want to use string directly instead of converting it to byte[] byte[] bdata = null; try { @@ -98,7 +98,7 @@ public class AtmosphereWebSocketHandler implements WebSocketProtocol { } protected List<AtmosphereRequest> invokeService(final WebSocket webSocket, final InputStream stream) { - LOG.info("invokeService(WebSocket, InputStream)"); + LOG.fine("invokeService(WebSocket, InputStream)"); // invoke the service directly as onMessage is synchronously blocked (in jetty) // make sure the byte array passed to this method is immutable, as the websocket framework // may corrupt the byte array after this method is returned (i.e., before the data is returned in @@ -161,7 +161,7 @@ public class AtmosphereWebSocketHandler implements WebSocketProtocol { /** {@inheritDoc}*/ @Override public void onError(WebSocket webSocket, WebSocketException t) { - LOG.info("onError(WebSocket, WebSocketException)"); + LOG.severe("onError(WebSocket, WebSocketException)"); } // protected WebSocketVirtualServletRequest createServletRequest(WebSocketServletHolder webSocketHolder, http://git-wip-us.apache.org/repos/asf/cxf/blob/481466c7/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketStreamHandler.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketStreamHandler.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketStreamHandler.java index 1ddc652..1f4cc00 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketStreamHandler.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/atmosphere/AtmosphereWebSocketStreamHandler.java @@ -38,7 +38,7 @@ public class AtmosphereWebSocketStreamHandler extends AtmosphereWebSocketHandler @Override public List<AtmosphereRequest> onTextStream(WebSocket webSocket, Reader r) { - LOG.info("onTextStream(WebSocket, Reader)"); + LOG.fine("onTextStream(WebSocket, Reader)"); //TODO add support for Reader throw new IllegalArgumentException("not implemented"); } http://git-wip-us.apache.org/repos/asf/cxf/blob/481466c7/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java ---------------------------------------------------------------------- diff --git a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java index 8d0f596..822f9ed 100644 --- a/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java +++ b/rt/transports/websocket/src/main/java/org/apache/cxf/transport/websocket/jetty/JettyWebSocket.java @@ -82,8 +82,8 @@ class JettyWebSocket implements WebSocket.OnBinaryMessage, WebSocket.OnTextMessa @Override public void onMessage(String data) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "onMessage({0})", data); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "onMessage({0})", data); } try { //TODO may want use string directly instead of converting it to byte[] @@ -96,8 +96,8 @@ class JettyWebSocket implements WebSocket.OnBinaryMessage, WebSocket.OnTextMessa @Override public void onMessage(byte[] data, int offset, int length) { - if (LOG.isLoggable(Level.INFO)) { - LOG.log(Level.INFO, "onMessage({0}, {1}, {2})", new Object[]{data, offset, length}); + if (LOG.isLoggable(Level.FINE)) { + LOG.log(Level.FINE, "onMessage({0}, {1}, {2})", new Object[]{data, offset, length}); } final byte[] safedata = new byte[length]; System.arraycopy(data, offset, safedata, 0, length); @@ -165,7 +165,7 @@ class JettyWebSocket implements WebSocket.OnBinaryMessage, WebSocket.OnTextMessa * @param length */ void write(byte[] data, int offset, int length) throws IOException { - LOG.log(Level.INFO, "write(byte[], offset, length)"); + LOG.log(Level.FINE, "write(byte[], offset, length)"); webSocketConnection.sendMessage(data, offset, length); }
