[jboss-remoting-commits] JBoss Remoting SVN: r5802 - in remoting3/trunk/jboss-remoting/src: main/java/org/jboss/remoting3/spi and 1 other directories.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Fri Mar 5 01:22:59 EST 2010
Author: david.lloyd at jboss.com
Date: 2010-03-05 01:22:57 -0500 (Fri, 05 Mar 2010)
New Revision: 5802
Added:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/Loggers.java
Modified:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/AbstractMessageHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientAuthenticationHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientGreetingHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientOpenListener.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundReplyTask.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestInputHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestTask.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundStream.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundReplyBufferWriter.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundRequestBufferWriter.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundRequestHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/PrimaryObjectTable.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteConnection.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteConnectionHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteMessageHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerAuthenticationHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerGreetingHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerInitialAuthenticationHandler.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerOpenListener.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractHandleableCloseable.java
remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/CloseableTestCase.java
remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/EndpointTestCase.java
remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/InvocationTestBase.java
Log:
Clean up logging a lot
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/AbstractMessageHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/AbstractMessageHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/AbstractMessageHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -39,7 +39,7 @@
remoteConnection.getChannel().shutdownReads();
return;
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Failed to shut down reads for %s", remoteConnection);
+ Loggers.main.trace(e, "Failed to shut down reads for %s", remoteConnection);
IoUtils.safeClose(remoteConnection);
}
}
@@ -49,7 +49,7 @@
// ignore; just means there was a race.
return;
}
- RemoteConnectionHandler.log.trace(e, "Received exception from %s", remoteConnection);
+ Loggers.main.trace(e, "Received exception from %s", remoteConnection);
IoUtils.safeClose(remoteConnection);
}
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientAuthenticationHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientAuthenticationHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientAuthenticationHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -32,6 +32,7 @@
import org.jboss.xnio.Buffers;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.Result;
+import org.jboss.xnio.log.Logger;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
@@ -41,6 +42,7 @@
private final RemoteConnection remoteConnection;
private final SaslClient saslClient;
private final Result<ConnectionHandlerFactory> factoryResult;
+ private static final Logger log = Loggers.clientSasl;
ClientAuthenticationHandler(final RemoteConnection remoteConnection, final SaslClient saslClient, final Result<ConnectionHandlerFactory> factoryResult) {
super(remoteConnection, factoryResult);
@@ -53,10 +55,10 @@
final byte msgType = buffer.get();
switch (msgType) {
case RemoteProtocol.AUTH_CHALLENGE: {
- RemoteConnectionHandler.log.trace("Received challenge message");
+ log.trace("Received challenge message");
final boolean clientComplete = saslClient.isComplete();
if (clientComplete) {
- RemoteConnectionHandler.log.trace("Received extra auth challenge message on %s after completion", remoteConnection);
+ log.trace("Received extra auth challenge message on %s after completion", remoteConnection);
factoryResult.setException(new SaslException("Received extra auth message after completion"));
IoUtils.safeClose(remoteConnection);
return;
@@ -66,57 +68,57 @@
try {
response = saslClient.evaluateChallenge(challenge);
if (msgType == RemoteProtocol.AUTH_COMPLETE && response != null && response.length > 0) {
- RemoteConnectionHandler.log.trace("Received extra auth message on %s", remoteConnection);
+ log.trace("Received extra auth message on %s", remoteConnection);
factoryResult.setException(new SaslException("Received extra auth message after completion"));
IoUtils.safeClose(remoteConnection);
return;
}
} catch (SaslException e) {
- RemoteConnectionHandler.log.trace(e, "Authentication error");
+ log.trace(e, "Authentication error");
factoryResult.setException(e);
try {
remoteConnection.shutdownWritesBlocking();
} catch (IOException e1) {
- RemoteConnectionHandler.log.trace(e, "Unable to shut down writes");
+ log.trace(e, "Unable to shut down writes");
}
return;
}
try {
- RemoteConnectionHandler.log.trace("Sending SASL response");
+ log.trace("Sending SASL response");
remoteConnection.sendAuthMessage(RemoteProtocol.AUTH_RESPONSE, response);
} catch (IOException e) {
factoryResult.setException(e);
- RemoteConnectionHandler.log.trace("Failed to send auth response message on %s", remoteConnection);
+ log.trace("Failed to send auth response message on %s", remoteConnection);
IoUtils.safeClose(remoteConnection);
return;
}
return;
}
case RemoteProtocol.AUTH_COMPLETE: {
- RemoteConnectionHandler.log.trace("Received auth complete message");
+ log.trace("Received auth complete message");
final boolean clientComplete = saslClient.isComplete();
final byte[] challenge = Buffers.take(buffer, buffer.remaining());
if (! clientComplete) try {
final byte[] response = saslClient.evaluateChallenge(challenge);
if (response != null && response.length > 0) {
- RemoteConnectionHandler.log.trace("Received extra auth message on %s", remoteConnection);
+ log.trace("Received extra auth message on %s", remoteConnection);
factoryResult.setException(new SaslException("Received extra auth message after completion"));
IoUtils.safeClose(remoteConnection);
return;
}
if (! saslClient.isComplete()) {
- RemoteConnectionHandler.log.trace("Client not complete after processing auth complete message on %s", remoteConnection);
+ log.trace("Client not complete after processing auth complete message on %s", remoteConnection);
factoryResult.setException(new SaslException("Client not complete after processing auth complete message"));
IoUtils.safeClose(remoteConnection);
return;
}
} catch (SaslException e) {
- RemoteConnectionHandler.log.trace(e, "Authentication error");
+ log.trace(e, "Authentication error");
factoryResult.setException(e);
try {
remoteConnection.shutdownWritesBlocking();
} catch (IOException e1) {
- RemoteConnectionHandler.log.trace(e, "Unable to shut down writes");
+ log.trace(e, "Unable to shut down writes");
}
return;
}
@@ -138,7 +140,7 @@
return;
}
case RemoteProtocol.AUTH_REJECTED: {
- RemoteConnectionHandler.log.trace("Received auth rejected message");
+ log.trace("Received auth rejected message");
factoryResult.setException(new SaslException("Authentication failed"));
IoUtils.safeClose(remoteConnection);
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientGreetingHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientGreetingHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientGreetingHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -38,6 +38,7 @@
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.OptionMap;
import org.jboss.xnio.Result;
+import org.jboss.xnio.log.Logger;
import javax.security.auth.callback.CallbackHandler;
import javax.security.sasl.Sasl;
@@ -50,6 +51,8 @@
private final CallbackHandler callbackHandler;
private final AccessControlContext accessControlContext;
+ private static final Logger log = Loggers.clientSasl;
+
ClientGreetingHandler(final RemoteConnection connection, final Result<ConnectionHandlerFactory> factoryResult, final CallbackHandler callbackHandler, final AccessControlContext accessControlContext) {
super(connection, factoryResult);
this.connection = connection;
@@ -65,7 +68,7 @@
int bestVersion = -1;
switch (buffer.get()) {
case RemoteProtocol.GREETING: {
- RemoteConnectionHandler.log.trace("Client received greeting message");
+ log.trace("Client received greeting message");
while (buffer.hasRemaining()) {
final byte type = buffer.get();
final int len = buffer.get() & 0xff;
@@ -131,16 +134,16 @@
} catch (PrivilegedActionException e) {
final SaslException se = (SaslException) e.getCause();
factoryResult.setException(se);
- RemoteConnectionHandler.log.trace(se, "Client connect authentication error");
+ log.trace(se, "Client connect authentication error");
try {
remoteConnection.shutdownWritesBlocking();
} catch (IOException e1) {
- RemoteConnectionHandler.log.trace(e1, "Failed to shutdown writes on %s", remoteConnection);
+ log.trace(e1, "Failed to shutdown writes on %s", remoteConnection);
}
return;
}
final String mechanismName = saslClient.getMechanismName();
- RemoteConnectionHandler.log.trace("Sasl mechanism selected: %s", mechanismName);
+ log.trace("Sasl mechanism selected: %s", mechanismName);
final ByteBuffer outBuf = connection.allocate();
try {
outBuf.putInt(0);
@@ -149,7 +152,7 @@
outBuf.flip();
connection.sendBlocking(outBuf, true);
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Failed to send auth request on %s", remoteConnection);
+ log.trace(e, "Failed to send auth request on %s", remoteConnection);
factoryResult.setException(e);
return;
} finally {
@@ -159,11 +162,11 @@
return;
}
default: {
- RemoteConnectionHandler.log.warn("Received invalid greeting packet on %s", remoteConnection);
+ log.warn("Received invalid greeting packet on %s", remoteConnection);
try {
remoteConnection.shutdownWritesBlocking();
} catch (IOException e1) {
- RemoteConnectionHandler.log.trace(e1, "Failed to shutdown writes on %s", remoteConnection);
+ log.trace(e1, "Failed to shutdown writes on %s", remoteConnection);
}
return;
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientOpenListener.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientOpenListener.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ClientOpenListener.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -35,6 +35,7 @@
import org.jboss.xnio.Options;
import org.jboss.xnio.Result;
import org.jboss.xnio.channels.ConnectedStreamChannel;
+import org.jboss.xnio.log.Logger;
import javax.security.auth.callback.CallbackHandler;
@@ -47,6 +48,8 @@
private final ProviderDescriptor providerDescriptor;
private final AccessControlContext accessControlContext;
+ private static final Logger log = Loggers.client;
+
ClientOpenListener(final OptionMap optionMap, final ConnectionProviderContext connectionProviderContext, final Result<ConnectionHandlerFactory> factoryResult, final CallbackHandler callbackHandler, final ProviderDescriptor providerDescriptor, final AccessControlContext accessControlContext) {
this.optionMap = optionMap;
this.connectionProviderContext = connectionProviderContext;
@@ -86,7 +89,7 @@
try {
res = channel.write(buffer);
} catch (IOException e1) {
- RemoteConnectionHandler.log.trace(e1, "Failed to send client greeting message");
+ log.trace(e1, "Failed to send client greeting message");
factoryResult.setException(e1);
IoUtils.safeClose(connection);
connection.free(buffer);
@@ -101,12 +104,12 @@
try {
while (! channel.flush());
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Failed to flush client greeting message");
+ log.trace(e, "Failed to flush client greeting message");
factoryResult.setException(e);
IoUtils.safeClose(connection);
return;
}
- RemoteConnectionHandler.log.trace("Client sent greeting message");
+ log.trace("Client sent greeting message");
channel.resumeReads();
return;
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundReplyTask.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundReplyTask.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundReplyTask.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -28,12 +28,15 @@
import org.jboss.remoting3.spi.ReplyHandler;
import org.jboss.remoting3.spi.SpiUtils;
import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
final class InboundReplyTask implements Runnable {
private final OutboundRequest outboundRequest;
private RemoteConnectionHandler remoteConnectionHandler;
+ private static final Logger log = Loggers.main;
+
InboundReplyTask(final RemoteConnectionHandler remoteConnectionHandler, final OutboundRequest outboundRequest) {
this.remoteConnectionHandler = remoteConnectionHandler;
this.outboundRequest = outboundRequest;
@@ -50,7 +53,7 @@
final RemoteConnectionHandler connectionHandler = remoteConnectionHandler;
final Unmarshaller unmarshaller = connectionHandler.getMarshallerFactory().createUnmarshaller(connectionHandler.getMarshallingConfiguration());
try {
- RemoteConnectionHandler.log.trace("Unmarshalling inbound reply");
+ log.trace("Unmarshalling inbound reply");
unmarshaller.start(outboundRequest.getByteInput());
final RemoteConnectionHandler old = RemoteConnectionHandler.setCurrent(connectionHandler);
try {
@@ -59,20 +62,20 @@
} finally {
RemoteConnectionHandler.setCurrent(old);
}
- RemoteConnectionHandler.log.trace("Unmarshalled inbound reply %s", reply);
+ log.trace("Unmarshalled inbound reply %s", reply);
} finally {
IoUtils.safeClose(unmarshaller);
}
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Unmarshalling inbound reply failed");
+ log.trace(e, "Unmarshalling inbound reply failed");
SpiUtils.safeHandleException(replyHandler, e);
return;
} catch (Exception e) {
- RemoteConnectionHandler.log.trace(e, "Unmarshalling inbound reply failed");
+ log.trace(e, "Unmarshalling inbound reply failed");
SpiUtils.safeHandleException(replyHandler, new RemoteRequestException(e));
return;
} catch (Error e) {
- RemoteConnectionHandler.log.trace(e, "Unmarshalling inbound reply failed");
+ log.trace(e, "Unmarshalling inbound reply failed");
SpiUtils.safeHandleException(replyHandler, new RemoteRequestException(e));
throw e;
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestInputHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestInputHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestInputHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -26,11 +26,14 @@
import java.nio.ByteBuffer;
import org.jboss.marshalling.NioByteInput;
import org.jboss.xnio.Pool;
+import org.jboss.xnio.log.Logger;
final class InboundRequestInputHandler implements NioByteInput.InputHandler {
private final int rid;
private final InboundRequest inboundRequest;
+ private static final Logger log = Loggers.main;
+
public InboundRequestInputHandler(final InboundRequest inboundRequest, final int rid) {
this.inboundRequest = inboundRequest;
this.rid = rid;
@@ -48,7 +51,7 @@
final RemoteConnection connection = connectionHandler.getRemoteConnection();
connection.sendBlocking(buffer, true);
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Failed to acknowledge chunk for %s", this);
+ log.trace(e, "Failed to acknowledge chunk for %s", this);
} finally {
bufferPool.free(buffer);
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestTask.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestTask.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundRequestTask.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -28,6 +28,7 @@
import org.jboss.remoting3.RemoteRequestException;
import org.jboss.remoting3.spi.SpiUtils;
import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
final class InboundRequestTask implements Runnable {
@@ -36,6 +37,8 @@
private final int cid;
private RemoteConnectionHandler remoteConnectionHandler;
+ private static final Logger log = Loggers.main;
+
InboundRequestTask(final RemoteConnectionHandler remoteConnectionHandler, final InboundRequest inboundRequest, final int rid, final int cid) {
this.remoteConnectionHandler = remoteConnectionHandler;
this.inboundRequest = inboundRequest;
@@ -53,7 +56,7 @@
try {
final Unmarshaller unmarshaller = remoteConnectionHandler.getMarshallerFactory().createUnmarshaller(remoteConnectionHandler.getMarshallingConfiguration());
try {
- RemoteConnectionHandler.log.trace("Unmarshalling inbound request");
+ log.trace("Unmarshalling inbound request");
unmarshaller.start(inboundRequest.getByteInput());
final RemoteConnectionHandler old = RemoteConnectionHandler.setCurrent(remoteConnectionHandler);
try {
@@ -62,20 +65,20 @@
} finally {
RemoteConnectionHandler.setCurrent(old);
}
- RemoteConnectionHandler.log.trace("Unmarshalled inbound request %s", request);
+ log.trace("Unmarshalled inbound request %s", request);
} finally {
IoUtils.safeClose(unmarshaller);
}
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Unmarshalling inbound request failed");
+ log.trace(e, "Unmarshalling inbound request failed");
SpiUtils.safeHandleException(replyHandler, e);
return;
} catch (Exception e) {
- RemoteConnectionHandler.log.trace(e, "Unmarshalling inbound request failed");
+ log.trace(e, "Unmarshalling inbound request failed");
SpiUtils.safeHandleException(replyHandler, new RemoteRequestException(e));
return;
} catch (Error e) {
- RemoteConnectionHandler.log.trace(e, "Unmarshalling inbound request failed");
+ log.trace(e, "Unmarshalling inbound request failed");
SpiUtils.safeHandleException(replyHandler, new RemoteRequestException(e));
throw e;
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundStream.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundStream.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/InboundStream.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -27,6 +27,7 @@
import java.nio.ByteBuffer;
import org.jboss.marshalling.NioByteInput;
import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
final class InboundStream {
private final int id;
@@ -34,6 +35,7 @@
private final Receiver receiver;
private State state;
+ private static final Logger log = Loggers.main;
InboundStream(final int id, final RemoteConnection remoteConnection, final Receiver receiver) {
this.id = id;
@@ -228,7 +230,7 @@
outputStream.write(array);
}
} catch (IOException e) {
- RemoteConnectionHandler.log.trace("Output stream write failed: %s", e);
+ log.trace("Output stream write failed: %s", e);
sendAsyncException();
}
}
Added: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/Loggers.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/Loggers.java (rev 0)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/Loggers.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.remoting3.remote;
+
+import org.jboss.xnio.log.Logger;
+
+final class Loggers {
+
+ static final Logger main = Logger.getLogger("org.jboss.remoting.remote");
+ static final Logger client = Logger.getLogger("org.jboss.remoting.remote.client");
+ static final Logger clientSasl = Logger.getLogger("org.jboss.remoting.remote.client.sasl");
+ static final Logger server = Logger.getLogger("org.jboss.remoting.remote.server");
+ static final Logger serverSasl = Logger.getLogger("org.jboss.remoting.remote.server.sasl");
+
+ private Loggers() {
+ }
+}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundReplyBufferWriter.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundReplyBufferWriter.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundReplyBufferWriter.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -28,6 +28,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import org.jboss.marshalling.NioByteOutput;
import org.jboss.xnio.Pool;
+import org.jboss.xnio.log.Logger;
final class OutboundReplyBufferWriter implements NioByteOutput.BufferWriter {
@@ -35,6 +36,7 @@
private final int id;
private final boolean exception;
private final InboundRequest inboundRequest;
+ private static final Logger log = Loggers.main;
OutboundReplyBufferWriter(final InboundRequest inboundRequest, final int id, final boolean exception) {
this.inboundRequest = inboundRequest;
@@ -46,7 +48,7 @@
final RemoteConnectionHandler connectionHandler = inboundRequest.getRemoteConnectionHandler();
final Pool<ByteBuffer> bufferPool = connectionHandler.getBufferPool();
final ByteBuffer buffer = bufferPool.allocate();
- RemoteConnectionHandler.log.trace("Allocated buffer %s for %s", buffer, this);
+ log.trace("Allocated buffer %s for %s", buffer, this);
buffer.putInt(RemoteConnectionHandler.LENGTH_PLACEHOLDER);
buffer.put(exception ? RemoteProtocol.REPLY_EXCEPTION : RemoteProtocol.REPLY);
buffer.putInt(id);
@@ -56,7 +58,7 @@
} else {
buffer.put((byte)0);
}
- RemoteConnectionHandler.log.trace("Prepopulated buffer %s for %s", buffer, this);
+ log.trace("Prepopulated buffer %s for %s", buffer, this);
return buffer;
}
@@ -72,7 +74,7 @@
if (eof) {
buffer.put(7, (byte) (buffer.get(3) | RemoteProtocol.MSG_FLAG_LAST));
}
- RemoteConnectionHandler.log.trace("Sending buffer %s for %s", buffer, this);
+ log.trace("Sending buffer %s for %s", buffer, this);
connectionHandler.getRemoteConnection().sendBlocking(buffer, eof);
} finally {
connectionHandler.getBufferPool().free(buffer);
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundRequestBufferWriter.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundRequestBufferWriter.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundRequestBufferWriter.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -27,6 +27,7 @@
import java.nio.ByteBuffer;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jboss.marshalling.NioByteOutput;
+import org.jboss.xnio.log.Logger;
final class OutboundRequestBufferWriter implements NioByteOutput.BufferWriter {
@@ -34,6 +35,8 @@
private final int rid;
private final OutboundRequest outboundRequest;
+ private static final Logger log = Loggers.main;
+
OutboundRequestBufferWriter(final OutboundRequest outboundRequest, final int rid) {
this.outboundRequest = outboundRequest;
this.rid = rid;
@@ -41,7 +44,7 @@
public ByteBuffer getBuffer() {
final ByteBuffer buffer = outboundRequest.getRemoteConnectionHandler().getBufferPool().allocate();
- RemoteConnectionHandler.log.trace("Allocated buffer %s for %s", buffer, this);
+ log.trace("Allocated buffer %s for %s", buffer, this);
buffer.putInt(RemoteConnectionHandler.LENGTH_PLACEHOLDER);
buffer.put(RemoteProtocol.REQUEST);
buffer.putInt(rid);
@@ -52,7 +55,7 @@
} else {
buffer.put((byte)0);
}
- RemoteConnectionHandler.log.trace("Prepopulated buffer %s for %s", buffer, this);
+ log.trace("Prepopulated buffer %s for %s", buffer, this);
return buffer;
}
@@ -72,7 +75,7 @@
outboundRequest.setState(OutboundRequest.State.REPLY_WAIT);
}
}
- RemoteConnectionHandler.log.trace("Sending buffer %s for %s", buffer, this);
+ log.trace("Sending buffer %s for %s", buffer, this);
remoteConnectionHandler.getRemoteConnection().sendBlocking(buffer, eof);
} finally {
remoteConnectionHandler.getBufferPool().free(buffer);
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundRequestHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundRequestHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/OutboundRequestHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -28,17 +28,18 @@
import org.jboss.marshalling.Marshaller;
import org.jboss.marshalling.NioByteOutput;
import org.jboss.marshalling.util.IntKeyMap;
-import org.jboss.remoting3.CloseHandler;
import org.jboss.remoting3.spi.AbstractHandleableCloseable;
import org.jboss.remoting3.spi.ReplyHandler;
import org.jboss.remoting3.spi.RequestHandler;
import org.jboss.remoting3.spi.SpiUtils;
import org.jboss.xnio.Cancellable;
import org.jboss.xnio.Pool;
+import org.jboss.xnio.log.Logger;
final class OutboundRequestHandler extends AbstractHandleableCloseable<RequestHandler> implements RequestHandler {
private final OutboundClient outboundClient;
+ private static final Logger log = Loggers.main;
OutboundRequestHandler(final OutboundClient outboundClient) {
super(outboundClient.getRemoteConnectionHandler().getConnectionContext().getConnectionProviderContext().getExecutor());
@@ -57,7 +58,7 @@
}
final NioByteOutput byteOutput = new NioByteOutput(new OutboundRequestBufferWriter(outboundRequest, rid));
try {
- RemoteConnectionHandler.log.trace("Starting sending request %s for %s", request, Integer.valueOf(rid));
+ log.trace("Starting sending request %s for %s", request, Integer.valueOf(rid));
final Marshaller marshaller = connectionHandler.getMarshallerFactory().createMarshaller(connectionHandler.getMarshallingConfiguration());
marshaller.start(byteOutput);
RemoteConnectionHandler old = RemoteConnectionHandler.setCurrent(connectionHandler);
@@ -67,9 +68,9 @@
} finally {
RemoteConnectionHandler.setCurrent(old);
}
- RemoteConnectionHandler.log.trace("Finished sending request %s", request);
+ log.trace("Finished sending request %s", request);
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Got exception while marshalling request %s", request);
+ log.trace(e, "Got exception while marshalling request %s", request);
SpiUtils.safeHandleException(replyHandler, e);
synchronized (outboundRequests) {
outboundRequests.remove(rid);
@@ -86,7 +87,7 @@
try {
connectionHandler.getRemoteConnection().sendBlocking(buf, true);
} catch (IOException e1) {
- RemoteConnectionHandler.log.trace("Send failed: %s", e1);
+ log.trace("Send failed: %s", e1);
}
}
return outboundRequest;
@@ -110,8 +111,4 @@
bufferPool.free(buf);
}
}
-
- public Key addCloseHandler(final CloseHandler<? super RequestHandler> closeHandler) {
- return null;
- }
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/PrimaryObjectTable.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/PrimaryObjectTable.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/PrimaryObjectTable.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -40,12 +40,14 @@
import org.jboss.remoting3.stream.ObjectSource;
import org.jboss.remoting3.stream.ReaderInputStream;
import org.jboss.remoting3.stream.WriterOutputStream;
+import org.jboss.xnio.log.Logger;
final class PrimaryObjectTable implements ObjectTable {
private final Endpoint endpoint;
private final RemoteConnectionHandler connectionHandler;
private final Executor executor;
+ private static final Logger log = Loggers.main;
PrimaryObjectTable(final Endpoint endpoint, final RemoteConnectionHandler connectionHandler) {
this.endpoint = endpoint;
@@ -126,7 +128,7 @@
try {
executor.execute(new InboundObjectSinkReceiveTask(nioByteInput, inboundStream, connectionHandler, objectSink));
} catch (RejectedExecutionException e) {
- RemoteConnectionHandler.log.warn("Unable to start task for forwarded stream: %s", e);
+ log.warn("Unable to start task for forwarded stream: %s", e);
inboundStream.sendAsyncException();
}
}
@@ -149,7 +151,7 @@
try {
executor.execute(new OutboundObjectSourceTransmitTask(objectSource, outboundStream, connectionHandler));
} catch (RejectedExecutionException e) {
- RemoteConnectionHandler.log.warn("Unable to start task for forwarded stream: %s", e);
+ log.warn("Unable to start task for forwarded stream: %s", e);
outboundStream.sendException();
}
}
@@ -189,7 +191,7 @@
try {
executor.execute(new OutboundInputStreamTransmitTask(inputStream, outboundStream));
} catch (RejectedExecutionException e) {
- RemoteConnectionHandler.log.warn("Unable to start task for forwarded stream: %s", e);
+ log.warn("Unable to start task for forwarded stream: %s", e);
outboundStream.sendException();
}
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteConnection.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteConnection.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteConnection.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -37,6 +37,7 @@
import org.jboss.xnio.channels.Channels;
import org.jboss.xnio.channels.ConnectedStreamChannel;
import org.jboss.xnio.channels.MessageHandler;
+import org.jboss.xnio.log.Logger;
final class RemoteConnection extends AbstractHandleableCloseable<RemoteConnection> implements Closeable {
private final ConnectedStreamChannel<InetSocketAddress> channel;
@@ -45,6 +46,7 @@
private final MessageHandler.Setter messageHandlerSetter;
private final OptionMap optionMap;
private final Object writeLock = new Object();
+ private static final Logger log = Loggers.main;
RemoteConnection(final Executor executor, final ConnectedStreamChannel<InetSocketAddress> channel, final OptionMap optionMap, final ProviderDescriptor providerDescriptor) {
super(executor);
@@ -112,15 +114,15 @@
}
}
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to send");
+ log.trace(e, "Closing channel due to failure to send");
IoUtils.safeClose(channel);
throw e;
} catch (RuntimeException e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to send");
+ log.trace(e, "Closing channel due to failure to send");
IoUtils.safeClose(channel);
throw e;
} catch (Error e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to send");
+ log.trace(e, "Closing channel due to failure to send");
IoUtils.safeClose(channel);
throw e;
}
@@ -133,15 +135,15 @@
channel.awaitWritable();
}
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to flush");
+ log.trace(e, "Closing channel due to failure to flush");
IoUtils.safeClose(channel);
throw e;
} catch (RuntimeException e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to flush");
+ log.trace(e, "Closing channel due to failure to flush");
IoUtils.safeClose(channel);
throw e;
} catch (Error e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to flush");
+ log.trace(e, "Closing channel due to failure to flush");
IoUtils.safeClose(channel);
throw e;
}
@@ -155,15 +157,15 @@
channel.awaitWritable();
}
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to shutdown writes");
+ log.trace(e, "Closing channel due to failure to shutdown writes");
IoUtils.safeClose(channel);
throw e;
} catch (RuntimeException e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to shutdown writes");
+ log.trace(e, "Closing channel due to failure to shutdown writes");
IoUtils.safeClose(channel);
throw e;
} catch (Error e) {
- RemoteConnectionHandler.log.trace(e, "Closing channel due to failure to shutdown writes");
+ log.trace(e, "Closing channel due to failure to shutdown writes");
IoUtils.safeClose(channel);
throw e;
}
@@ -208,7 +210,7 @@
try {
channel.close();
} catch (IOException e) {
- RemoteConnectionHandler.log.trace("Channel terminate exception: %s", e);
+ log.trace("Channel terminate exception: %s", e);
}
}
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteConnectionHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteConnectionHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteConnectionHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -43,12 +43,9 @@
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.Pool;
import org.jboss.xnio.Result;
-import org.jboss.xnio.log.Logger;
final class RemoteConnectionHandler extends AbstractHandleableCloseable<RemoteConnectionHandler> implements ConnectionHandler {
- static final Logger log = Logger.getLogger("org.jboss.remoting.remote");
-
static final int LENGTH_PLACEHOLDER = 0;
private final Pool<ByteBuffer> bufferPool = Buffers.createHeapByteBufferAllocator(4096);
@@ -81,7 +78,7 @@
config.setStreamHeader(Marshalling.nullStreamHeader());
// fixed for now (v0)
config.setVersion(2);
- this.marshallingConfiguration = config;
+ marshallingConfiguration = config;
}
public Cancellable open(final String serviceType, final String groupName, final Result<RequestHandler> result) {
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteMessageHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteMessageHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/RemoteMessageHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -37,12 +37,15 @@
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.OptionMap;
import org.jboss.xnio.Pool;
+import org.jboss.xnio.log.Logger;
final class RemoteMessageHandler extends AbstractMessageHandler implements org.jboss.xnio.channels.MessageHandler {
private final RemoteConnection connection;
private final RemoteConnectionHandler remoteConnectionHandler;
+ private static final Logger log = Loggers.main;
+
RemoteMessageHandler(final RemoteConnectionHandler remoteConnectionHandler, final RemoteConnection connection) {
super(connection);
this.remoteConnectionHandler = remoteConnectionHandler;
@@ -81,7 +84,7 @@
connection.sendBlocking(outBuf, true);
} catch (IOException e) {
// the channel has suddenly failed
- RemoteConnectionHandler.log.trace("Send failed: %s", e);
+ log.trace("Send failed: %s", e);
}
return;
} finally {
@@ -97,7 +100,7 @@
client = outboundClients.remove(id);
}
if (client == null) {
- RemoteConnectionHandler.log.trace("Received service-not-found for unknown client %d", Integer.valueOf(id));
+ log.trace("Received service-not-found for unknown client %d", Integer.valueOf(id));
return;
}
synchronized (client) {
@@ -115,7 +118,7 @@
client = outboundClients.get(id);
}
if (client == null) {
- RemoteConnectionHandler.log.trace("Received service-client-opened for unknown client %d", Integer.valueOf(id));
+ log.trace("Received service-client-opened for unknown client %d", Integer.valueOf(id));
return;
}
synchronized (client) {
@@ -134,7 +137,7 @@
client = inboundClients.remove(id);
}
if (client == null) {
- RemoteConnectionHandler.log.trace("Received client-closed for unknown client %d", Integer.valueOf(id));
+ log.trace("Received client-closed for unknown client %d", Integer.valueOf(id));
return;
}
synchronized (client) {
@@ -157,14 +160,14 @@
start = true;
// todo - check for duplicate
inboundRequests.put(rid, inboundRequest);
- RemoteConnectionHandler.log.trace("Received first request message %s for %s", buffer, inboundRequest);
+ log.trace("Received first request message %s for %s", buffer, inboundRequest);
} else {
cid = 0;
inboundRequest = inboundRequests.get(rid);
- RemoteConnectionHandler.log.trace("Received subsequent request message %s for %s", buffer, inboundRequest);
+ log.trace("Received subsequent request message %s for %s", buffer, inboundRequest);
}
if (inboundRequest == null) {
- RemoteConnectionHandler.log.trace("Received request for unknown request ID %d", Integer.valueOf(rid));
+ log.trace("Received request for unknown request ID %d", Integer.valueOf(rid));
}
}
synchronized (inboundRequest) {
@@ -184,7 +187,7 @@
inboundRequest = inboundRequests.remove(rid);
}
if (inboundRequest == null) {
- RemoteConnectionHandler.log.trace("Received request-abort for unknown request ID %d", Integer.valueOf(rid));
+ log.trace("Received request-abort for unknown request ID %d", Integer.valueOf(rid));
return;
}
synchronized (inboundRequest) {
@@ -202,7 +205,7 @@
outboundRequest = outboundRequests.get(rid);
}
if (outboundRequest == null) {
- RemoteConnectionHandler.log.trace("Received request-ack-chunk for unknown request ID %d", Integer.valueOf(rid));
+ log.trace("Received request-ack-chunk for unknown request ID %d", Integer.valueOf(rid));
return;
}
synchronized (outboundRequest) {
@@ -220,17 +223,17 @@
outboundRequest = outboundRequests.get(rid);
}
if (outboundRequest == null) {
- RemoteConnectionHandler.log.trace("Received reply for unknown request ID %d", Integer.valueOf(rid));
+ log.trace("Received reply for unknown request ID %d", Integer.valueOf(rid));
return;
}
synchronized (outboundRequest) {
if ((flags & RemoteProtocol.MSG_FLAG_FIRST) != 0) {
- RemoteConnectionHandler.log.trace("Received first reply message %s for %s", buffer, outboundRequest);
+ log.trace("Received first reply message %s for %s", buffer, outboundRequest);
// todo - check for duplicate
outboundRequest.setByteInput(byteInput = new NioByteInput(new InboundReplyInputHandler(outboundRequest, rid)));
connectionHandler.getConnectionContext().getConnectionProviderContext().getExecutor().execute(new InboundReplyTask(connectionHandler, outboundRequest));
} else {
- RemoteConnectionHandler.log.trace("Received subsequent reply message %s for %s", buffer, outboundRequest);
+ log.trace("Received subsequent reply message %s for %s", buffer, outboundRequest);
byteInput = outboundRequest.getByteInput();
}
}
@@ -245,7 +248,7 @@
inboundRequest = inboundRequests.get(rid);
}
if (inboundRequest == null) {
- RemoteConnectionHandler.log.trace("Received reply-ack-chunk for unknown request ID %d", Integer.valueOf(rid));
+ log.trace("Received reply-ack-chunk for unknown request ID %d", Integer.valueOf(rid));
return;
}
synchronized (inboundRequest) {
@@ -263,7 +266,7 @@
outboundRequest = outboundRequests.get(rid);
}
if (outboundRequest == null) {
- RemoteConnectionHandler.log.trace("Received reply-exception for unknown request ID %d", Integer.valueOf(rid));
+ log.trace("Received reply-exception for unknown request ID %d", Integer.valueOf(rid));
return;
}
synchronized (outboundRequest) {
@@ -286,7 +289,7 @@
outboundRequest = outboundRequests.get(rid);
}
if (outboundRequest == null) {
- RemoteConnectionHandler.log.warn("Received reply-exception-abort for unknown request ID %d", Integer.valueOf(rid));
+ log.warn("Received reply-exception-abort for unknown request ID %d", Integer.valueOf(rid));
return;
}
final NioByteInput byteInput;
@@ -316,7 +319,7 @@
outboundStream = outboundStreams.get(sid);
}
if (outboundStream == null) {
- RemoteConnectionHandler.log.warn("Received stream-ack for unknown stream ID %d", Integer.valueOf(sid));
+ log.warn("Received stream-ack for unknown stream ID %d", Integer.valueOf(sid));
return;
}
outboundStream.ack();
@@ -330,7 +333,7 @@
outboundStream = outboundStreams.get(sid);
}
if (outboundStream == null) {
- RemoteConnectionHandler.log.warn("Received stream-ack for unknown stream ID %d", Integer.valueOf(sid));
+ log.warn("Received stream-ack for unknown stream ID %d", Integer.valueOf(sid));
return;
}
outboundStream.asyncClose();
@@ -344,7 +347,7 @@
outboundStream = outboundStreams.get(sid);
}
if (outboundStream == null) {
- RemoteConnectionHandler.log.warn("Received stream-async-exception for unknown stream ID %d", Integer.valueOf(sid));
+ log.warn("Received stream-async-exception for unknown stream ID %d", Integer.valueOf(sid));
return;
}
outboundStream.asyncException();
@@ -358,7 +361,7 @@
outboundStream = outboundStreams.get(sid);
}
if (outboundStream == null) {
- RemoteConnectionHandler.log.warn("Received stream-async-start for unknown stream ID %d", Integer.valueOf(sid));
+ log.warn("Received stream-async-start for unknown stream ID %d", Integer.valueOf(sid));
return;
}
outboundStream.asyncStart();
@@ -372,7 +375,7 @@
inboundStream = inboundStreams.get(sid);
}
if (inboundStream == null) {
- RemoteConnectionHandler.log.warn("Received stream-close for unknown stream ID %d", Integer.valueOf(sid));
+ log.warn("Received stream-close for unknown stream ID %d", Integer.valueOf(sid));
return;
}
inboundStream.getReceiver().pushEof();
@@ -386,7 +389,7 @@
inboundStream = inboundStreams.get(sid);
}
if (inboundStream == null) {
- RemoteConnectionHandler.log.warn("Received stream-data for unknown stream ID %d", Integer.valueOf(sid));
+ log.warn("Received stream-data for unknown stream ID %d", Integer.valueOf(sid));
return;
}
inboundStream.getReceiver().push(buffer);
@@ -400,14 +403,14 @@
inboundStream = inboundStreams.get(sid);
}
if (inboundStream == null) {
- RemoteConnectionHandler.log.warn("Received stream-exception for unknown stream ID %d", Integer.valueOf(sid));
+ log.warn("Received stream-exception for unknown stream ID %d", Integer.valueOf(sid));
return;
}
inboundStream.getReceiver().pushException();
return;
}
default: {
- RemoteConnectionHandler.log.error("Received invalid packet type on %s, closing", connectionHandler);
+ log.error("Received invalid packet type on %s, closing", connectionHandler);
IoUtils.safeClose(connectionHandler);
}
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerAuthenticationHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerAuthenticationHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerAuthenticationHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -32,6 +32,7 @@
import org.jboss.remoting3.spi.ConnectionProviderContext;
import org.jboss.xnio.Buffers;
import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
@@ -42,6 +43,8 @@
private final ConnectionProviderContext connectionProviderContext;
private final ServerInitialAuthenticationHandler initialAuthHandler;
+ private static final Logger log = Loggers.serverSasl;
+
ServerAuthenticationHandler(final RemoteConnection remoteConnection, final SaslServer saslServer, final ConnectionProviderContext connectionProviderContext, final ServerInitialAuthenticationHandler initialAuthHandler) {
super(remoteConnection);
this.saslServer = saslServer;
@@ -53,20 +56,20 @@
public void handleMessage(final ByteBuffer buffer) {
switch (buffer.get()) {
case RemoteProtocol.AUTH_RESPONSE: {
- RemoteConnectionHandler.log.trace("Received SASL response");
+ log.trace("Received SASL response");
final byte[] challenge;
try {
try {
challenge = saslServer.evaluateResponse(Buffers.take(buffer, buffer.remaining()));
} catch (SaslException e) {
- RemoteConnectionHandler.log.trace(e, "Server authentication failed");
+ log.trace(e, "Server authentication failed");
initialAuthHandler.rejectAuth();
remoteConnection.setMessageHandler(initialAuthHandler);
return;
}
final boolean complete = saslServer.isComplete();
if (complete) {
- RemoteConnectionHandler.log.trace("Sending SASL complete");
+ log.trace("Sending SASL complete");
remoteConnection.sendAuthMessage(RemoteProtocol.AUTH_COMPLETE, challenge);
connectionProviderContext.accept(new ConnectionHandlerFactory() {
public ConnectionHandler createInstance(final ConnectionHandlerContext connectionContext) {
@@ -82,17 +85,17 @@
}
});
} else {
- RemoteConnectionHandler.log.trace("Sending subsequent SASL challenge");
+ log.trace("Sending subsequent SASL challenge");
remoteConnection.sendAuthMessage(RemoteProtocol.AUTH_CHALLENGE, challenge);
}
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Failed to send auth message");
+ log.trace(e, "Failed to send auth message");
IoUtils.safeClose(remoteConnection);
}
break;
}
default: {
- RemoteConnectionHandler.log.warn("Server received invalid message on %s", remoteConnection);
+ log.warn("Server received invalid message on %s", remoteConnection);
IoUtils.safeClose(remoteConnection);
}
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerGreetingHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerGreetingHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerGreetingHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -28,6 +28,7 @@
import org.jboss.remoting3.spi.ConnectionProviderContext;
import org.jboss.xnio.Buffers;
import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
import javax.security.sasl.SaslServerFactory;
@@ -38,6 +39,8 @@
private final ServerAuthenticationProvider provider;
private final Map<String, Object> propertyMap;
+ private static final Logger log = Loggers.server;
+
ServerGreetingHandler(final RemoteConnection connection, final ConnectionProviderContext connectionProviderContext, final Map<String, SaslServerFactory> saslMechs, final ServerAuthenticationProvider provider, final Map<String, Object> propertyMap) {
super(connection);
this.connection = connection;
@@ -50,7 +53,7 @@
public void handleMessage(final ByteBuffer buffer) {
switch (buffer.get()) {
case RemoteProtocol.GREETING: {
- RemoteConnectionHandler.log.trace("Server received greeting message");
+ log.trace("Server received greeting message");
final int[] ourVersions = connection.getProviderDescriptor().getSupportedVersions();
int bestVersion = -1;
while (buffer.hasRemaining()) {
@@ -87,7 +90,7 @@
return;
}
default: {
- RemoteConnectionHandler.log.warn("Server received invalid greeting message");
+ log.warn("Server received invalid greeting message");
IoUtils.safeClose(connection);
}
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerInitialAuthenticationHandler.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerInitialAuthenticationHandler.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerInitialAuthenticationHandler.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -30,6 +30,7 @@
import org.jboss.remoting3.spi.ConnectionProviderContext;
import org.jboss.xnio.Buffers;
import org.jboss.xnio.IoUtils;
+import org.jboss.xnio.log.Logger;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
@@ -43,6 +44,8 @@
private final ConnectionProviderContext connectionProviderContext;
private int retries;
+ private static final Logger log = Loggers.serverSasl;
+
ServerInitialAuthenticationHandler(final RemoteConnection remoteConnection, final Map<String, ?> saslPropertyMap, final Map<String, SaslServerFactory> allowedMechs, final ServerAuthenticationProvider authenticationProvider, final ConnectionProviderContext connectionProviderContext) {
super(remoteConnection);
this.remoteConnection = remoteConnection;
@@ -61,34 +64,34 @@
final String name = Buffers.getModifiedUtf8(buffer);
final SaslServerFactory serverFactory = allowedMechs.get(name);
if (serverFactory != null) {
- RemoteConnectionHandler.log.trace("Selected SASL mechanism %s", name);
+ log.trace("Selected SASL mechanism %s", name);
final String realm = connectionProviderContext.getEndpoint().getName();
final SaslServer server = serverFactory.createSaslServer(name, "remote", realm, saslPropertyMap, authenticationProvider.getCallbackHandler());
remoteConnection.setMessageHandler(new ServerAuthenticationHandler(remoteConnection, server, connectionProviderContext, this));
- RemoteConnectionHandler.log.trace("Sending initial challenge");
+ log.trace("Sending initial challenge");
final byte[] resp;
try {
resp = server.evaluateResponse(SaslUtils.EMPTY);
} catch (SaslException e) {
- RemoteConnectionHandler.log.trace("Rejected invalid SASL response: %s", e);
+ log.trace("Rejected invalid SASL response: %s", e);
rejectAuth();
return;
}
remoteConnection.sendAuthMessage(RemoteProtocol.AUTH_CHALLENGE, resp);
return;
} else {
- RemoteConnectionHandler.log.trace("Rejected invalid SASL mechanism %s", name);
+ log.trace("Rejected invalid SASL mechanism %s", name);
rejectAuth();
return;
}
} catch (IOException e) {
IoUtils.safeClose(remoteConnection);
- RemoteConnectionHandler.log.trace("Failed to send auth message: %s", e);
+ log.trace("Failed to send auth message: %s", e);
return;
}
}
default: {
- RemoteConnectionHandler.log.warn("Server received invalid auth request message");
+ log.warn("Server received invalid auth request message");
IoUtils.safeClose(remoteConnection);
}
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerOpenListener.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerOpenListener.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/remote/ServerOpenListener.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -43,6 +43,7 @@
import org.jboss.xnio.Sequence;
import org.jboss.xnio.channels.ConnectedStreamChannel;
import org.jboss.xnio.channels.SslChannel;
+import org.jboss.xnio.log.Logger;
import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLSession;
@@ -54,6 +55,7 @@
private final OptionMap optionMap;
private final ConnectionProviderContext connectionProviderContext;
private final ProviderDescriptor providerDescriptor;
+ private static final Logger log = Loggers.serverSasl;
ServerOpenListener(final OptionMap optionMap, final ConnectionProviderContext connectionProviderContext, final ProviderDescriptor providerDescriptor) {
this.optionMap = optionMap;
@@ -72,13 +74,13 @@
// Get the server authentication provider
final String authProvider = optionMap.get(RemotingOptions.AUTHENTICATION_PROVIDER);
if (authProvider == null) {
- RemoteConnectionHandler.log.warn("No authentication provider available");
+ log.warn("No authentication provider available");
IoUtils.safeClose(connection);
return;
}
final ServerAuthenticationProvider provider = connectionProviderContext.getProtocolServiceProvider(ProtocolServiceType.SERVER_AUTHENTICATION_PROVIDER, authProvider);
if (provider == null) {
- RemoteConnectionHandler.log.warn("No authentication provider available");
+ log.warn("No authentication provider available");
IoUtils.safeClose(connection);
return;
}
@@ -110,12 +112,12 @@
}
if (saslServerFactories.isEmpty()) {
try {
- RemoteConnectionHandler.log.trace("Sending server no-mechanisms message");
+ log.trace("Sending server no-mechanisms message");
connection.sendAuthReject("No mechanisms available");
connection.close();
return;
} catch (IOException e1) {
- RemoteConnectionHandler.log.trace(e1, "Failed to send server no-mechanisms message");
+ log.trace(e1, "Failed to send server no-mechanisms message");
IoUtils.safeClose(connection);
return;
}
@@ -136,7 +138,7 @@
// SASL server mechs
for (String name : saslServerFactories.keySet()) {
GreetingUtils.writeString(buffer, RemoteProtocol.GREETING_SASL_MECH, name);
- RemoteConnectionHandler.log.trace("Offering SASL mechanism %s", name);
+ log.trace("Offering SASL mechanism %s", name);
}
GreetingUtils.writeString(buffer, RemoteProtocol.GREETING_ENDPOINT_NAME, connectionProviderContext.getEndpoint().getName());
// that's it!
@@ -150,7 +152,7 @@
try {
res = channel.write(buffer);
} catch (IOException e1) {
- RemoteConnectionHandler.log.trace(e1, "Failed to send server greeting message");
+ log.trace(e1, "Failed to send server greeting message");
IoUtils.safeClose(connection);
connection.free(buffer);
return;
@@ -164,11 +166,11 @@
try {
while (! channel.flush());
} catch (IOException e) {
- RemoteConnectionHandler.log.trace(e, "Failed to flush server greeting message");
+ log.trace(e, "Failed to flush server greeting message");
IoUtils.safeClose(connection);
return;
}
- RemoteConnectionHandler.log.trace("Server sent greeting message");
+ log.trace("Server sent greeting message");
channel.resumeReads();
return;
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractHandleableCloseable.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractHandleableCloseable.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractHandleableCloseable.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -23,7 +23,6 @@
package org.jboss.remoting3.spi;
import java.io.IOException;
-import java.io.InterruptedIOException;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.IdentityHashMap;
Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/CloseableTestCase.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/CloseableTestCase.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/CloseableTestCase.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -42,7 +42,7 @@
@Test
public final class CloseableTestCase {
- public static final Logger log = Logger.getLogger(CloseableTestCase.class);
+ private static final Logger log = Logger.getLogger("test");
public void testBasic() throws Throwable {
final ExecutorService executorService = Executors.newCachedThreadPool();
Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/EndpointTestCase.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/EndpointTestCase.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/EndpointTestCase.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -47,7 +47,7 @@
@Test
public final class EndpointTestCase {
- private static final Logger log = Logger.getLogger(EndpointTestCase.class);
+ private static final Logger log = Logger.getLogger("test");
private static void enter() {
log.info("Entering: %s", new Throwable().getStackTrace()[1].getMethodName());
Modified: remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/InvocationTestBase.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/InvocationTestBase.java 2010-03-05 04:58:25 UTC (rev 5801)
+++ remoting3/trunk/jboss-remoting/src/test/java/org/jboss/remoting3/test/InvocationTestBase.java 2010-03-05 06:22:57 UTC (rev 5802)
@@ -50,7 +50,7 @@
@Test
public abstract class InvocationTestBase {
- private static final Logger log = Logger.getLogger(InvocationTestBase.class);
+ private static final Logger log = Logger.getLogger("test");
protected Endpoint endpoint;
More information about the jboss-remoting-commits
mailing list