Author: david.lloyd(a)jboss.com Date: 2008-02-21 10:17:59 -0500 (Thu, 21 Feb 2008) New Revision: 3463 Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/CommonKeys.java remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreEndpoint.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundRequest.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundContext.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/LocalProtocol.java remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppProtocolSupport.java remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppServer.java remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/AttributeHashMap.java remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/AttributeMap.java remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/IoUtil.java remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/MessageInput.java remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/ServiceURI.java Log: Clean up imports Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/CommonKeys.java =================================================================== --- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/CommonKeys.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/CommonKeys.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -1,15 +1,13 @@ package org.jboss.cx.remoting; -import org.jboss.cx.remoting.core.util.AttributeKey; - +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.List; +import org.jboss.cx.remoting.core.util.AttributeKey; +import static org.jboss.cx.remoting.core.util.AttributeKey.key; import javax.security.auth.callback.CallbackHandler; -import static org.jboss.cx.remoting.core.util.AttributeKey.key; - /** * A set of attribute keys that are common across various protocols. */ Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java =================================================================== --- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -2,11 +2,11 @@ import java.net.URI; import java.util.concurrent.ConcurrentMap; +import org.jboss.cx.remoting.core.util.AttributeMap; import org.jboss.cx.remoting.spi.Discovery; import org.jboss.cx.remoting.spi.Registration; import org.jboss.cx.remoting.spi.protocol.ProtocolRegistration; import org.jboss.cx.remoting.spi.protocol.ProtocolRegistrationSpec; -import org.jboss.cx.remoting.core.util.AttributeMap; /** * A potential participant in a JBoss Remoting communications relationship. Modified: remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java =================================================================== --- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/protocol/ProtocolContext.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -6,8 +6,8 @@ import org.jboss.cx.remoting.ServiceLocator; import org.jboss.cx.remoting.core.util.ByteInput; import org.jboss.cx.remoting.core.util.ByteOutput; +import org.jboss.cx.remoting.core.util.MessageInput; import org.jboss.cx.remoting.core.util.MessageOutput; -import org.jboss.cx.remoting.core.util.MessageInput; /** * Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreEndpoint.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreEndpoint.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreEndpoint.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -20,8 +20,8 @@ import org.jboss.cx.remoting.ServiceLocator; import org.jboss.cx.remoting.Session; import org.jboss.cx.remoting.core.util.AtomicStateMachine; +import org.jboss.cx.remoting.core.util.AttributeMap; import org.jboss.cx.remoting.core.util.CollectionUtil; -import org.jboss.cx.remoting.core.util.AttributeMap; import org.jboss.cx.remoting.spi.Discovery; import org.jboss.cx.remoting.spi.Registration; import org.jboss.cx.remoting.spi.protocol.ProtocolContext; Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundRequest.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundRequest.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreInboundRequest.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -5,8 +5,8 @@ import org.jboss.cx.remoting.RequestCancelHandler; import org.jboss.cx.remoting.RequestContext; import org.jboss.cx.remoting.RequestListener; +import org.jboss.cx.remoting.core.util.AtomicStateMachine; import org.jboss.cx.remoting.log.Logger; -import org.jboss.cx.remoting.core.util.AtomicStateMachine; import org.jboss.cx.remoting.spi.protocol.RequestIdentifier; /** Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundContext.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundContext.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreOutboundContext.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -7,9 +7,9 @@ import org.jboss.cx.remoting.RemoteExecutionException; import org.jboss.cx.remoting.RemotingException; import org.jboss.cx.remoting.RequestCompletionHandler; -import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.core.util.AtomicStateMachine; import org.jboss.cx.remoting.core.util.CollectionUtil; +import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.spi.protocol.ContextIdentifier; import org.jboss.cx.remoting.spi.protocol.RequestIdentifier; Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreSession.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -4,32 +4,32 @@ import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; import java.io.OutputStream; -import java.io.ObjectStreamClass; import java.lang.ref.WeakReference; +import java.net.URI; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import java.net.URI; import org.jboss.cx.remoting.ContextSource; import org.jboss.cx.remoting.RemoteExecutionException; import org.jboss.cx.remoting.RemotingException; import org.jboss.cx.remoting.RequestListener; import org.jboss.cx.remoting.ServiceLocator; import org.jboss.cx.remoting.Session; -import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.core.stream.DefaultStreamDetector; import org.jboss.cx.remoting.core.util.AtomicStateMachine; +import org.jboss.cx.remoting.core.util.AttributeMap; +import org.jboss.cx.remoting.core.util.ByteInput; +import org.jboss.cx.remoting.core.util.ByteOutput; import org.jboss.cx.remoting.core.util.CollectionUtil; -import org.jboss.cx.remoting.core.util.ByteOutput; -import org.jboss.cx.remoting.core.util.ByteInput; -import org.jboss.cx.remoting.spi.protocol.ContextIdentifier; import org.jboss.cx.remoting.core.util.MessageInput; import org.jboss.cx.remoting.core.util.MessageOutput; -import org.jboss.cx.remoting.core.util.AttributeMap; +import org.jboss.cx.remoting.log.Logger; +import org.jboss.cx.remoting.spi.protocol.ContextIdentifier; import org.jboss.cx.remoting.spi.protocol.ProtocolContext; import org.jboss.cx.remoting.spi.protocol.ProtocolHandler; import org.jboss.cx.remoting.spi.protocol.ProtocolHandlerFactory; Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/CoreStream.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -2,9 +2,9 @@ import java.io.IOException; import java.util.concurrent.Executor; +import org.jboss.cx.remoting.core.util.MessageInput; +import org.jboss.cx.remoting.core.util.MessageOutput; import org.jboss.cx.remoting.log.Logger; -import org.jboss.cx.remoting.core.util.MessageOutput; -import org.jboss.cx.remoting.core.util.MessageInput; import org.jboss.cx.remoting.spi.protocol.ProtocolHandler; import org.jboss.cx.remoting.spi.protocol.StreamIdentifier; import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer; Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/LocalProtocol.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/LocalProtocol.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/LocalProtocol.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -10,12 +10,12 @@ import org.jboss.cx.remoting.RemoteExecutionException; import org.jboss.cx.remoting.RemotingException; import org.jboss.cx.remoting.ServiceLocator; +import org.jboss.cx.remoting.core.util.AttributeMap; import org.jboss.cx.remoting.core.util.CollectionUtil; +import org.jboss.cx.remoting.core.util.MessageInput; +import org.jboss.cx.remoting.core.util.MessageOutput; import org.jboss.cx.remoting.log.Logger; -import org.jboss.cx.remoting.core.util.MessageOutput; import org.jboss.cx.remoting.spi.protocol.ContextIdentifier; -import org.jboss.cx.remoting.core.util.MessageInput; -import org.jboss.cx.remoting.core.util.AttributeMap; import org.jboss.cx.remoting.spi.protocol.ProtocolContext; import org.jboss.cx.remoting.spi.protocol.ProtocolHandler; import org.jboss.cx.remoting.spi.protocol.ProtocolHandlerFactory; Modified: remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java =================================================================== --- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -3,9 +3,9 @@ import java.io.IOException; import java.io.InputStream; import java.util.LinkedList; -import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.core.util.MessageInput; import org.jboss.cx.remoting.core.util.MessageOutput; +import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.spi.stream.RemoteStreamSerializer; import org.jboss.cx.remoting.spi.stream.StreamContext; import org.jboss.cx.remoting.spi.stream.StreamSerializer; Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppConnection.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -1,17 +1,15 @@ package org.jboss.cx.remoting.jrpp; -import static java.lang.Math.min; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; -import java.util.Set; -import java.util.Map; -import java.util.HashMap; -import java.util.List; +import static java.lang.Math.min; import java.util.Enumeration; -import java.util.LinkedHashSet; +import java.util.HashMap; import java.util.HashSet; -import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.Executor; import org.apache.mina.common.AttributeKey; import org.apache.mina.common.IdleStatus; @@ -20,15 +18,14 @@ import org.apache.mina.filter.sasl.SaslClientFilter; import org.apache.mina.filter.sasl.SaslServerFilter; import org.apache.mina.handler.multiton.SingleSessionIoHandler; +import org.jboss.cx.remoting.CommonKeys; import org.jboss.cx.remoting.RemoteExecutionException; import org.jboss.cx.remoting.ServiceLocator; -import org.jboss.cx.remoting.CommonKeys; -import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.core.util.AtomicStateMachine; +import org.jboss.cx.remoting.core.util.AttributeMap; import org.jboss.cx.remoting.core.util.CollectionUtil; import org.jboss.cx.remoting.core.util.MessageInput; import org.jboss.cx.remoting.core.util.MessageOutput; -import org.jboss.cx.remoting.core.util.AttributeMap; import org.jboss.cx.remoting.jrpp.id.IdentifierManager; import org.jboss.cx.remoting.jrpp.id.JrppContextIdentifier; import org.jboss.cx.remoting.jrpp.id.JrppRequestIdentifier; @@ -36,6 +33,7 @@ import org.jboss.cx.remoting.jrpp.id.JrppStreamIdentifier; import org.jboss.cx.remoting.jrpp.mina.IoBufferByteInput; import org.jboss.cx.remoting.jrpp.mina.IoBufferByteOutput; +import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.spi.protocol.ContextIdentifier; import org.jboss.cx.remoting.spi.protocol.ProtocolContext; import org.jboss.cx.remoting.spi.protocol.ProtocolHandler; @@ -44,18 +42,18 @@ import org.jboss.cx.remoting.spi.protocol.ServiceIdentifier; import org.jboss.cx.remoting.spi.protocol.StreamIdentifier; -import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; +import javax.security.sasl.AuthorizeCallback; +import javax.security.sasl.RealmCallback; import javax.security.sasl.Sasl; -import javax.security.sasl.SaslException; import javax.security.sasl.SaslClient; +import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; -import javax.security.sasl.RealmCallback; import javax.security.sasl.SaslServerFactory; -import javax.security.sasl.AuthorizeCallback; /** * @@ -177,7 +175,7 @@ return mechanisms; } - private String[] getClientMechanisms(final AttributeMap attributeMap, final Map<String, ?> saslProps) { + private String[] getClientMechanisms(final AttributeMap attributeMap) { final List<String> list = attributeMap.get(CommonKeys.SASL_CLIENT_MECHANISMS); if (list != null) { return list.toArray(new String[list.size()]); @@ -321,7 +319,7 @@ private void sendAuthRequest() throws IOException { final CallbackHandler callbackHandler = getClientCallbackHandler(attributeMap); final Map<String, ?> saslProps = getSaslProperties(attributeMap); - final String[] clientMechs = getClientMechanisms(attributeMap, saslProps); + final String[] clientMechs = getClientMechanisms(attributeMap); final String authorizationId = getAuthorizationId(attributeMap, protocolContext); final SaslClient saslClient = Sasl.createSaslClient(clientMechs, authorizationId, "jrpp", remoteName, saslProps, callbackHandler); final SaslClientFilter saslClientFilter = getSaslClientFilter(); @@ -758,7 +756,7 @@ oldClientFilter.destroy(); final CallbackHandler callbackHandler = getClientCallbackHandler(attributeMap); final Map<String, ?> saslProps = getSaslProperties(attributeMap); - final String[] clientMechs = getClientMechanisms(attributeMap, saslProps); + final String[] clientMechs = getClientMechanisms(attributeMap); final String authorizationId = getAuthorizationId(attributeMap, protocolContext); final SaslClient saslClient = Sasl.createSaslClient(clientMechs, authorizationId, "jrpp", remoteName, saslProps, callbackHandler); final SaslClientFilter saslClientFilter = getSaslClientFilter(); Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppProtocolSupport.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppProtocolSupport.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppProtocolSupport.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -1,15 +1,15 @@ package org.jboss.cx.remoting.jrpp; import java.io.IOException; +import java.net.InetSocketAddress; import java.net.SocketAddress; import java.net.URI; -import java.net.InetSocketAddress; import java.util.concurrent.Executor; +import org.apache.mina.common.ConnectFuture; import org.apache.mina.common.IoConnector; +import org.apache.mina.common.IoProcessor; import org.apache.mina.common.IoSession; -import org.apache.mina.common.ConnectFuture; import org.apache.mina.common.IoSessionInitializer; -import org.apache.mina.common.IoProcessor; import org.apache.mina.filter.logging.LoggingFilter; import org.apache.mina.filter.sasl.SaslClientFilter; import org.apache.mina.filter.sasl.SaslMessageSender; Modified: remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppServer.java =================================================================== --- remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppServer.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/jrpp/src/main/java/org/jboss/cx/remoting/jrpp/JrppServer.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -1,22 +1,22 @@ package org.jboss.cx.remoting.jrpp; +import java.io.IOException; import java.net.SocketAddress; import java.util.concurrent.Executor; -import java.io.IOException; -import org.apache.mina.transport.socket.nio.NioSocketAcceptor; import org.apache.mina.common.IoAcceptor; import org.apache.mina.common.IoHandler; +import org.apache.mina.common.IoProcessor; import org.apache.mina.common.IoSession; -import org.apache.mina.common.IoProcessor; import org.apache.mina.filter.logging.LoggingFilter; +import org.apache.mina.filter.sasl.SaslMessageSender; import org.apache.mina.filter.sasl.SaslServerFilter; -import org.apache.mina.filter.sasl.SaslMessageSender; -import org.apache.mina.handler.multiton.SingleSessionIoHandlerFactory; import org.apache.mina.handler.multiton.SingleSessionIoHandler; import org.apache.mina.handler.multiton.SingleSessionIoHandlerDelegate; +import org.apache.mina.handler.multiton.SingleSessionIoHandlerFactory; +import org.apache.mina.transport.socket.nio.NioSocketAcceptor; +import org.jboss.cx.remoting.core.util.AttributeMap; import org.jboss.cx.remoting.jrpp.mina.FramingIoFilter; import org.jboss.cx.remoting.spi.protocol.ProtocolServerContext; -import org.jboss.cx.remoting.core.util.AttributeMap; /** * Modified: remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java =================================================================== --- remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -1,20 +1,20 @@ package org.jboss.cx.remoting; +import java.io.IOException; import java.net.URI; -import java.io.IOException; -import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.core.CoreEndpointProvider; +import org.jboss.cx.remoting.core.util.AttributeHashMap; import org.jboss.cx.remoting.core.util.AttributeMap; -import org.jboss.cx.remoting.core.util.AttributeHashMap; +import org.jboss.cx.remoting.log.Logger; import org.jboss.cx.remoting.spi.EndpointProvider; import org.jboss.cx.remoting.spi.wrapper.ContextSourceWrapper; import org.jboss.cx.remoting.spi.wrapper.SessionWrapper; +import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; -import javax.security.auth.callback.Callback; -import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; /** * Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/AttributeHashMap.java =================================================================== --- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/AttributeHashMap.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/AttributeHashMap.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -1,9 +1,9 @@ package org.jboss.cx.remoting.core.util; -import java.util.Set; import java.util.Collection; import java.util.Iterator; import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentMap; /** Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/AttributeMap.java =================================================================== --- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/AttributeMap.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/AttributeMap.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -1,7 +1,7 @@ package org.jboss.cx.remoting.core.util; +import java.util.Collection; import java.util.Set; -import java.util.Collection; /** * Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/IoUtil.java =================================================================== --- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/IoUtil.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/IoUtil.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -2,7 +2,6 @@ import java.nio.ByteBuffer; import java.nio.CharBuffer; -import java.io.OutputStream; /** * Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/MessageInput.java =================================================================== --- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/MessageInput.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/MessageInput.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -1,7 +1,7 @@ package org.jboss.cx.remoting.core.util; +import java.io.IOException; import java.io.ObjectInput; -import java.io.IOException; /** * Modified: remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/ServiceURI.java =================================================================== --- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/ServiceURI.java 2008-02-21 15:15:06 UTC (rev 3462) +++ remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/core/util/ServiceURI.java 2008-02-21 15:17:59 UTC (rev 3463) @@ -2,8 +2,8 @@ import java.net.URI; import java.net.URISyntaxException; +import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.regex.Matcher; /** *