[jboss-remoting-commits] JBoss Remoting SVN: r4573 - in remoting3/trunk: api/src/main/java/org/jboss/cx and 78 other directories.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Wed Sep 17 23:06:40 EDT 2008
Author: david.lloyd at jboss.com
Date: 2008-09-17 23:06:39 -0400 (Wed, 17 Sep 2008)
New Revision: 4573
Added:
remoting3/trunk/api/src/main/java/org/jboss/remoting/
remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/CommonKeys.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/IOExceptionCarrier.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingExceptionCarrier.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/
remoting3/trunk/api/src/test/java/org/jboss/remoting/
remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/
remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/
remoting3/trunk/core/src/main/java/org/jboss/remoting/
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/
remoting3/trunk/core/src/test/java/org/jboss/remoting/
remoting3/trunk/core/src/test/java/org/jboss/remoting/core/
remoting3/trunk/http-se6/src/main/java/org/jboss/remoting/
remoting3/trunk/http-se6/src/main/java/org/jboss/remoting/http/
remoting3/trunk/http-servlet/src/main/java/org/jboss/remoting/
remoting3/trunk/http-servlet/src/main/java/org/jboss/remoting/http/
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/remoting/
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/remoting/http/
remoting3/trunk/http/src/main/java/org/jboss/remoting/
remoting3/trunk/http/src/main/java/org/jboss/remoting/http/
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/beans/
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/
remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/
remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/
remoting3/trunk/samples/src/main/java/org/jboss/remoting/
remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/
remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/
remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/
remoting3/trunk/srp/src/main/java/org/jboss/remoting/
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/
remoting3/trunk/standalone/src/main/java/org/jboss/remoting/
remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java
remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/
remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/
remoting3/trunk/tools/src/main/java/org/jboss/remoting/
remoting3/trunk/tools/src/main/java/org/jboss/remoting/tools/
remoting3/trunk/util/src/main/java/org/jboss/remoting/
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/
remoting3/trunk/version/src/main/java/org/jboss/remoting/
remoting3/trunk/version/src/main/java/org/jboss/remoting/version/
Removed:
remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/CommonKeys.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/IOExceptionCarrier.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteServiceRegistration.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingExceptionCarrier.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/
remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/
remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/
remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/
remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/
remoting3/trunk/core/src/test/java/org/jboss/cx/remoting/
remoting3/trunk/core/src/test/java/org/jboss/remoting/core/
remoting3/trunk/http-se6/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/http-se6/src/main/java/org/jboss/remoting/http/
remoting3/trunk/http-servlet/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/http-servlet/src/main/java/org/jboss/remoting/http/
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/http-urlconnection/src/main/java/org/jboss/remoting/http/
remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/http/src/main/java/org/jboss/remoting/http/
remoting3/trunk/mc-deployers/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/beans/
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/
remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/
remoting3/trunk/protocol/basic/src/test/java/org/jboss/cx/remoting/
remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/
remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/
remoting3/trunk/sasl-null/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/
remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/
remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java
remoting3/trunk/testing-support/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/
remoting3/trunk/tools/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/tools/src/main/java/org/jboss/remoting/tools/
remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/
remoting3/trunk/version/src/main/java/org/jboss/cx/remoting/
remoting3/trunk/version/src/main/java/org/jboss/remoting/version/
Modified:
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractAutoCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractHandleableCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractSimpleCloseable.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/SpiUtils.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/Handle.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RemoteRequestContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/ReplyHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RequestHandler.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RequestHandlerSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamContext.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamDetector.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamSerializerFactory.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/ClientSourceWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/ClientWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/EndpointWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/RequestContextWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/package-info.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ByteBufferInputStream.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ByteBufferOutputStream.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/CharBufferReader.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/CharBufferWriter.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSink.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSinkWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSource.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSourceWrapper.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/Streams.java
remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/package-info.java
remoting3/trunk/api/src/main/resources/META-INF/jboss-classloading.xml
remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/CloseableTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/ByteBufferInputStreamTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/ByteBufferOutputStreamTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/CharBufferReaderTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/CharBufferWriterTestCase.java
remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/StreamsTestCase.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureClientSource.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureReplyImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceRegistration.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/DefaultStreamDetector.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/InputStreamStreamSerializerFactory.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/ObjectSourceStreamSerializerFactory.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/OutputStreamStreamSerailizerFactory.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/DecodingBuilder.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/QueueExecutor.java
remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/TaggingExecutor.java
remoting3/trunk/core/src/test/java/org/jboss/remoting/core/EndpointTestCase.java
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/EndpointMetaData.java
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/RemotingMetaData.java
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/SessionMetaData.java
remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/SessionMetaDataAttribute.java
remoting3/trunk/mc-deployers/src/main/resources/META-INF/remoting-deployer-beans.xml
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/AbstractConnection.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicHandler.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicProtocol.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/ConfigValue.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/ConnectionListener.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/MessageType.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/RemotingChannelConfiguration.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/SimpleWriteHandler.java
remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/WriteHandler.java
remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/ConnectionTestCase.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalBasicExampleMain.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalStreamExampleMain.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/StreamingRot13RequestListener.java
remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/StringRot13RequestListener.java
remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslClientImpl.java
remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslFactoryImpl.java
remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslServerImpl.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/AbstractSrpSaslParticipant.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/BufferFactory.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/NioSaslEndpoint.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/Provider.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/Srp.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpOptions.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslClientFactoryImpl.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslClientImpl.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslServerFactoryImpl.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslServerImpl.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpVerifier.java
remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpVerifierCallback.java
remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/LoggingHelper.java
remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/LoggingSecurityManager.java
remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/TestByteBufferAllocator.java
remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/TestCharBufferAllocator.java
remoting3/trunk/tools/src/main/java/org/jboss/remoting/tools/PasswordEncoder.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AtomicMap.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AtomicStateMachine.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeHashMap.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeKey.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeMap.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Base64DecodingException.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Base64Util.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/CollectionUtil.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ConcurrentIntegerMap.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ConcurrentReferenceHashMap.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/DelegateIterable.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/EmulatedConcurrentIntegerHashMap.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/NamingThreadFactory.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/OrderedExecutor.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/OrderedExecutorFactory.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ServiceURI.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/State.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/StateLock.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedCollection.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedIterator.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedMap.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedQueue.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedSet.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Translator.java
remoting3/trunk/util/src/main/java/org/jboss/remoting/util/WeakHashSet.java
remoting3/trunk/version/src/main/java/org/jboss/remoting/version/Version.java
Log:
org.jboss.cx -> org.jboss...
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting)
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/AbstractRequestListener.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,34 +0,0 @@
-package org.jboss.cx.remoting;
-
-/**
- * A simple request listener implementation that implements all methods with no-operation implementations.
- *
- * @param <I> the request type
- * @param <O> the reply type
- */
-public abstract class AbstractRequestListener<I, O> implements RequestListener<I, O> {
-
- /**
- * {@inheritDoc} This implementation performs no operation.
- */
- public void handleClientOpen(final ClientContext context) {
- }
-
- /**
- * {@inheritDoc} This implementation performs no operation.
- */
- public void handleServiceOpen(final ServiceContext context) {
- }
-
- /**
- * {@inheritDoc} This implementation performs no operation.
- */
- public void handleServiceClose(final ServiceContext context) {
- }
-
- /**
- * {@inheritDoc} This implementation performs no operation.
- */
- public void handleClientClose(final ClientContext context) {
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/AbstractRequestListener.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/AbstractRequestListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,34 @@
+package org.jboss.remoting;
+
+/**
+ * A simple request listener implementation that implements all methods with no-operation implementations.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ */
+public abstract class AbstractRequestListener<I, O> implements RequestListener<I, O> {
+
+ /**
+ * {@inheritDoc} This implementation performs no operation.
+ */
+ public void handleClientOpen(final ClientContext context) {
+ }
+
+ /**
+ * {@inheritDoc} This implementation performs no operation.
+ */
+ public void handleServiceOpen(final ServiceContext context) {
+ }
+
+ /**
+ * {@inheritDoc} This implementation performs no operation.
+ */
+ public void handleServiceClose(final ServiceContext context) {
+ }
+
+ /**
+ * {@inheritDoc} This implementation performs no operation.
+ */
+ public void handleClientClose(final ClientContext context) {
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Client.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,66 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.util.concurrent.ConcurrentMap;
-import java.io.IOException;
-import org.jboss.xnio.IoFuture;
-
-/**
- * A communications client. The client may be associated with state maintained by the local and/or remote side.
- *
- * @param <I> the request type
- * @param <O> the reply type
- */
-public interface Client<I, O> extends HandleableCloseable<Client<I, O>> {
- /**
- * Send a request and block until a reply is received.
- * <p/>
- * Uses the default invocation policy for handling remote invocations. If the remote side manipulates a stream, the
- * current thread will be used to handle it by default.
- * <p/>
- * If the remote session cannot handle the request, a {@code RemotingException} will be thrown.
- *
- * @param request the request to send
- *
- * @return the result of the request
- *
- * @throws RemotingException if the request could not be sent
- * @throws RemoteExecutionException if the remote handler threw an exception
- */
- O invoke(I request) throws IOException;
-
- /**
- * Send a request asynchronously.
- * <p/>
- * Uses the default invocation policy for handling remote invocations. If the remote side manipulates a stream, it
- * MAY fail with an exception (e.g. if this method is called on a client with no threads to handle streaming).
- * <p/>
- * Returns immediately.
- *
- * @param request the request to send
- *
- * @return a future representing the result of the request
- *
- * @throws IOException if the request could not be sent
- */
- IoFuture<O> send(I request) throws IOException;
-
- /**
- * Send a request asynchronously, ignoring the reply.
- * </p>
- * Uses the default invocation policy for handling remote invocations. If the remote side manipulates a stream, it
- * MAY fail with an exception (e.g. if this method is called on a client with no threads to handle streaming).
- * <p/>
- * Returns immediately.
- *
- * @param request the request to send
- * @throws IOException if the request could not be sent
- */
- void sendOneWay(I request) throws IOException;
-
- /**
- * Get the attribute map. This map holds metadata about the current clinet.
- *
- * @return the attribute map
- */
- ConcurrentMap<Object, Object> getAttributes();
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Client.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/Client.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,66 @@
+package org.jboss.remoting;
+
+import java.util.concurrent.ConcurrentMap;
+import java.io.IOException;
+import org.jboss.xnio.IoFuture;
+
+/**
+ * A communications client. The client may be associated with state maintained by the local and/or remote side.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ */
+public interface Client<I, O> extends HandleableCloseable<Client<I, O>> {
+ /**
+ * Send a request and block until a reply is received.
+ * <p/>
+ * Uses the default invocation policy for handling remote invocations. If the remote side manipulates a stream, the
+ * current thread will be used to handle it by default.
+ * <p/>
+ * If the remote session cannot handle the request, a {@code RemotingException} will be thrown.
+ *
+ * @param request the request to send
+ *
+ * @return the result of the request
+ *
+ * @throws RemotingException if the request could not be sent
+ * @throws RemoteExecutionException if the remote handler threw an exception
+ */
+ O invoke(I request) throws IOException;
+
+ /**
+ * Send a request asynchronously.
+ * <p/>
+ * Uses the default invocation policy for handling remote invocations. If the remote side manipulates a stream, it
+ * MAY fail with an exception (e.g. if this method is called on a client with no threads to handle streaming).
+ * <p/>
+ * Returns immediately.
+ *
+ * @param request the request to send
+ *
+ * @return a future representing the result of the request
+ *
+ * @throws IOException if the request could not be sent
+ */
+ IoFuture<O> send(I request) throws IOException;
+
+ /**
+ * Send a request asynchronously, ignoring the reply.
+ * </p>
+ * Uses the default invocation policy for handling remote invocations. If the remote side manipulates a stream, it
+ * MAY fail with an exception (e.g. if this method is called on a client with no threads to handle streaming).
+ * <p/>
+ * Returns immediately.
+ *
+ * @param request the request to send
+ * @throws IOException if the request could not be sent
+ */
+ void sendOneWay(I request) throws IOException;
+
+ /**
+ * Get the attribute map. This map holds metadata about the current clinet.
+ *
+ * @return the attribute map
+ */
+ ConcurrentMap<Object, Object> getAttributes();
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ClientContext.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,23 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * The server context for a single remote client instance.
- */
-public interface ClientContext extends HandleableCloseable<ClientContext> {
- /**
- * Get the attributes for this end of the channel as a map.
- *
- * @return the attribute map
- */
- ConcurrentMap<Object, Object> getAttributes();
-
- /**
- * Get the service that this context is associated with, or {@code null} if there is no
- * service.
- *
- * @return the service, or {@code null} if there is none
- */
- ServiceContext getServiceContext();
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ClientContext.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientContext.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,23 @@
+package org.jboss.remoting;
+
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * The server context for a single remote client instance.
+ */
+public interface ClientContext extends HandleableCloseable<ClientContext> {
+ /**
+ * Get the attributes for this end of the channel as a map.
+ *
+ * @return the attribute map
+ */
+ ConcurrentMap<Object, Object> getAttributes();
+
+ /**
+ * Get the service that this context is associated with, or {@code null} if there is no
+ * service.
+ *
+ * @return the service, or {@code null} if there is none
+ */
+ ServiceContext getServiceContext();
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ClientSource.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,24 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.io.IOException;
-
-/**
- * A source for new Remoting contexts.
- *
- * @param <I> the request type
- * @param <O> the reply type
- */
-public interface ClientSource<I, O> extends HandleableCloseable<ClientSource<I, O>> {
- /**
- * Close the context source. New contexts may no longer be created after this
- * method is called. Subsequent calls to this method have no additional effect.
- */
- void close() throws IOException;
-
- /**
- * Create a new communications context.
- *
- * @return the new context
- */
- Client<I, O> createClient() throws IOException;
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ClientSource.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ClientSource.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,24 @@
+package org.jboss.remoting;
+
+import java.io.IOException;
+
+/**
+ * A source for new Remoting contexts.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ */
+public interface ClientSource<I, O> extends HandleableCloseable<ClientSource<I, O>> {
+ /**
+ * Close the context source. New contexts may no longer be created after this
+ * method is called. Subsequent calls to this method have no additional effect.
+ */
+ void close() throws IOException;
+
+ /**
+ * Create a new communications context.
+ *
+ * @return the new context
+ */
+ Client<I, O> createClient() throws IOException;
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/CloseHandler.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,16 +0,0 @@
-package org.jboss.cx.remoting;
-
-/**
- * A handler which is notified of a resource close.
- *
- * @param <T> the type of resource
- */
-public interface CloseHandler<T> {
-
- /**
- * Receive a notification that the resource was closed.
- *
- * @param closed the closed resource
- */
- void handleClose(T closed);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/CloseHandler.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/CloseHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,16 @@
+package org.jboss.remoting;
+
+/**
+ * A handler which is notified of a resource close.
+ *
+ * @param <T> the type of resource
+ */
+public interface CloseHandler<T> {
+
+ /**
+ * Receive a notification that the resource was closed.
+ *
+ * @param closed the closed resource
+ */
+ void handleClose(T closed);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/CommonKeys.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/CommonKeys.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/CommonKeys.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,60 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.jboss.cx.remoting.util.AttributeKey;
-import static org.jboss.cx.remoting.util.AttributeKey.key;
-
-import javax.security.auth.callback.CallbackHandler;
-
-/**
- * A set of attribute keys that are common across various protocols.
- */
-public final class CommonKeys {
- private CommonKeys() { /* no construction */ }
-
- // SASL
-
- /**
- * A key that represents the SASL properties to be used for this connection or server.
- */
- public static final AttributeKey<Map<String, ?>> SASL_PROPERTIES = key("SASL_PROPERTIES");
- /**
- * The SASL client mechanisms to try, in order. If none are given, then the list is generated based on the registered
- * providers.
- */
- public static final AttributeKey<List<String>> SASL_CLIENT_MECHANISMS = key("SASL_CLIENT_MECHANISMS");
- /**
- * The SASL server mechanisms to make available to clients. If none are given, then the set is generated based on
- * the registered providers.
- */
- public static final AttributeKey<Set<String>> SASL_SERVER_MECHANISMS = key("SASL_SERVER_MECHANISMS");
-
- // Generic auth
-
- /**
- * The authentication callback handler to make available to the authentication layer.
- */
- public static final AttributeKey<CallbackHandler> AUTH_CALLBACK_HANDLER = key("AUTH_CALLBACK_HANDLER");
- /**
- * The client authorization ID to send to the server. If not specified, defaults to the local endpoint name. If
- * the local endpoint is anonymous, defaults to {@code null}.
- */
- public static final AttributeKey<String> AUTHORIZATION_ID = key("AUTHORIZATION_ID");
- /**
- * The maximum number of times to retry authentication before giving up and failing.
- */
- public static final AttributeKey<Integer> AUTH_MAX_RETRIES = key("AUTH_MAX_RETRIES");
-
- // TODO: add keys for SSL/TLS
-
- // Protocol keys
-
- /**
- * The keepalive interval. For protocols that are represented by a connection of some sort, this property indicates
- * that a "keepalive" message should be sent at regular intervals to prevent an idle connection from being
- * automatically closed by a firewall (for example).
- */
- public static final AttributeKey<Integer> KEEPALIVE_INTERVAL = key("KEEPALIVE_INTERVAL");
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/CommonKeys.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/CommonKeys.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/CommonKeys.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/CommonKeys.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,60 @@
+package org.jboss.remoting;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.jboss.remoting.util.AttributeKey;
+import static org.jboss.remoting.util.AttributeKey.key;
+
+import javax.security.auth.callback.CallbackHandler;
+
+/**
+ * A set of attribute keys that are common across various protocols.
+ */
+public final class CommonKeys {
+ private CommonKeys() { /* no construction */ }
+
+ // SASL
+
+ /**
+ * A key that represents the SASL properties to be used for this connection or server.
+ */
+ public static final AttributeKey<Map<String, ?>> SASL_PROPERTIES = key("SASL_PROPERTIES");
+ /**
+ * The SASL client mechanisms to try, in order. If none are given, then the list is generated based on the registered
+ * providers.
+ */
+ public static final AttributeKey<List<String>> SASL_CLIENT_MECHANISMS = key("SASL_CLIENT_MECHANISMS");
+ /**
+ * The SASL server mechanisms to make available to clients. If none are given, then the set is generated based on
+ * the registered providers.
+ */
+ public static final AttributeKey<Set<String>> SASL_SERVER_MECHANISMS = key("SASL_SERVER_MECHANISMS");
+
+ // Generic auth
+
+ /**
+ * The authentication callback handler to make available to the authentication layer.
+ */
+ public static final AttributeKey<CallbackHandler> AUTH_CALLBACK_HANDLER = key("AUTH_CALLBACK_HANDLER");
+ /**
+ * The client authorization ID to send to the server. If not specified, defaults to the local endpoint name. If
+ * the local endpoint is anonymous, defaults to {@code null}.
+ */
+ public static final AttributeKey<String> AUTHORIZATION_ID = key("AUTHORIZATION_ID");
+ /**
+ * The maximum number of times to retry authentication before giving up and failing.
+ */
+ public static final AttributeKey<Integer> AUTH_MAX_RETRIES = key("AUTH_MAX_RETRIES");
+
+ // TODO: add keys for SSL/TLS
+
+ // Protocol keys
+
+ /**
+ * The keepalive interval. For protocols that are represented by a connection of some sort, this property indicates
+ * that a "keepalive" message should be sent at regular intervals to prevent an idle connection from being
+ * automatically closed by a firewall (for example).
+ */
+ public static final AttributeKey<Integer> KEEPALIVE_INTERVAL = key("KEEPALIVE_INTERVAL");
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,122 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.util.concurrent.ConcurrentMap;
-import java.net.URI;
-import java.io.IOException;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.Handle;
-import org.jboss.xnio.IoFuture;
-
-/**
- * A potential participant in a JBoss Remoting communications relationship.
- */
-public interface Endpoint {
- /**
- * Get the endpoint attribute map. This is a storage area for any data associated with this endpoint, including
- * (but not limited to) connection and protocol information, and application information.
- *
- * You must have the TODO permission to invoke this method.
- *
- * @return the endpoint map
- */
- ConcurrentMap<Object, Object> getAttributes();
-
- /**
- * Get the name of this endpoint.
- *
- * @return the endpoint name, or {@code null} if there is no name
- */
- String getName();
-
- /**
- * Create a request handler that can be used to receive incoming requests on this endpoint. The client may be passed to a
- * remote endpoint as part of a request or a reply, or it may be used locally.
- *
- * You must have the TODO permission to invoke this method.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param requestListener the request listener
- * @return a handle for the client
- * @throws IOException if an error occurs
- */
- <I, O> Handle<RequestHandler> createRequestHandler(RequestListener<I, O> requestListener) throws IOException;
-
- /**
- * Create a request handler source that can be used to acquire clients associated with a request listener on this endpoint.
- * The request handler source may be passed to a remote endpoint as part of a request or a reply, or it may be used locally.
- * The objects that are produced by this method may be used to mass-produce {@code RequestHandler} instances.
- *
- * You must have the TODO permission to invoke this method.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param requestListener the request listener
- * @param serviceType the type of service to advertise
- * @param groupName the name of the group of this type to be part of
- * @return a handle for the client source
- * @throws IOException if an error occurs
- */
- <I, O> Handle<RequestHandlerSource> createRequestHandlerSource(RequestListener<I, O> requestListener, String serviceType, String groupName) throws IOException;
-
- /**
- * Create a client that uses the given request handler to handle its requests.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param handler the request handler
- * @return the client
- * @throws IOException if an error occurs
- */
- <I, O> Client<I, O> createClient(RequestHandler handler) throws IOException;
-
- /**
- * Create a client source that uses the given request handler source to generate clients.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param handlerSource the request handler source
- * @return the client source
- * @throws IOException if an error occurs
- */
- <I, O> ClientSource<I, O> createClientSource(RequestHandlerSource handlerSource) throws IOException;
-
- /**
- * Attempt to locate a service. The return value then be queried for the service's {@code ClientSource}.
- *
- * @param <I> the request type
- * @param <O> the reply type
- * @param serviceUri the URI of the service
- * @return the future service
- * @throws IllegalArgumentException if the given URI is not a valid Remoting service URI
- */
- <I, O> IoFuture<ClientSource<I, O>> locateService(URI serviceUri) throws IllegalArgumentException;
-
- /**
- * Register a remotely available service.<p>
- * The remote endpoint may not have the same name as this endpoint. The group name and service type must be
- * non-{@code null} and non-empty. The metric must be greater than zero.
- *
- * @param serviceType the service type string
- * @param groupName the group name
- * @param endpointName the name of the remote endpoint
- * @param handlerSource the remote handler source
- * @param metric the preference metric, lower is more preferred
- * @return a handle corresponding to the registration
- * @throws IllegalArgumentException if one of the given arguments was not valid
- * @throws IOException if an error occurs with the registration
- */
- SimpleCloseable registerRemoteService(String serviceType, String groupName, String endpointName, RequestHandlerSource handlerSource, int metric) throws IllegalArgumentException, IOException;
-
- /**
- * Add a listener for observing when local and remote services are added. The caller may specify whether the listener
- * should be notified of the complete list of currently registered services (set {@code onlyNew} to {@code false})
- * or only services registered after the time of calling this method (set {@code onlyNew} to {@code true}).
- *
- * @param serviceListener the listener
- * @param onlyNew {@code true} if only new registrations should be sent to the listener
- * @return a handle which may be used to unregister the listener
- */
- SimpleCloseable addServiceListener(ServiceListener serviceListener, boolean onlyNew);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/Endpoint.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/Endpoint.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,122 @@
+package org.jboss.remoting;
+
+import java.util.concurrent.ConcurrentMap;
+import java.net.URI;
+import java.io.IOException;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.spi.remote.Handle;
+import org.jboss.xnio.IoFuture;
+
+/**
+ * A potential participant in a JBoss Remoting communications relationship.
+ */
+public interface Endpoint {
+ /**
+ * Get the endpoint attribute map. This is a storage area for any data associated with this endpoint, including
+ * (but not limited to) connection and protocol information, and application information.
+ *
+ * You must have the TODO permission to invoke this method.
+ *
+ * @return the endpoint map
+ */
+ ConcurrentMap<Object, Object> getAttributes();
+
+ /**
+ * Get the name of this endpoint.
+ *
+ * @return the endpoint name, or {@code null} if there is no name
+ */
+ String getName();
+
+ /**
+ * Create a request handler that can be used to receive incoming requests on this endpoint. The client may be passed to a
+ * remote endpoint as part of a request or a reply, or it may be used locally.
+ *
+ * You must have the TODO permission to invoke this method.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param requestListener the request listener
+ * @return a handle for the client
+ * @throws IOException if an error occurs
+ */
+ <I, O> Handle<RequestHandler> createRequestHandler(RequestListener<I, O> requestListener) throws IOException;
+
+ /**
+ * Create a request handler source that can be used to acquire clients associated with a request listener on this endpoint.
+ * The request handler source may be passed to a remote endpoint as part of a request or a reply, or it may be used locally.
+ * The objects that are produced by this method may be used to mass-produce {@code RequestHandler} instances.
+ *
+ * You must have the TODO permission to invoke this method.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param requestListener the request listener
+ * @param serviceType the type of service to advertise
+ * @param groupName the name of the group of this type to be part of
+ * @return a handle for the client source
+ * @throws IOException if an error occurs
+ */
+ <I, O> Handle<RequestHandlerSource> createRequestHandlerSource(RequestListener<I, O> requestListener, String serviceType, String groupName) throws IOException;
+
+ /**
+ * Create a client that uses the given request handler to handle its requests.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param handler the request handler
+ * @return the client
+ * @throws IOException if an error occurs
+ */
+ <I, O> Client<I, O> createClient(RequestHandler handler) throws IOException;
+
+ /**
+ * Create a client source that uses the given request handler source to generate clients.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param handlerSource the request handler source
+ * @return the client source
+ * @throws IOException if an error occurs
+ */
+ <I, O> ClientSource<I, O> createClientSource(RequestHandlerSource handlerSource) throws IOException;
+
+ /**
+ * Attempt to locate a service. The return value then be queried for the service's {@code ClientSource}.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ * @param serviceUri the URI of the service
+ * @return the future service
+ * @throws IllegalArgumentException if the given URI is not a valid Remoting service URI
+ */
+ <I, O> IoFuture<ClientSource<I, O>> locateService(URI serviceUri) throws IllegalArgumentException;
+
+ /**
+ * Register a remotely available service.<p>
+ * The remote endpoint may not have the same name as this endpoint. The group name and service type must be
+ * non-{@code null} and non-empty. The metric must be greater than zero.
+ *
+ * @param serviceType the service type string
+ * @param groupName the group name
+ * @param endpointName the name of the remote endpoint
+ * @param handlerSource the remote handler source
+ * @param metric the preference metric, lower is more preferred
+ * @return a handle corresponding to the registration
+ * @throws IllegalArgumentException if one of the given arguments was not valid
+ * @throws IOException if an error occurs with the registration
+ */
+ SimpleCloseable registerRemoteService(String serviceType, String groupName, String endpointName, RequestHandlerSource handlerSource, int metric) throws IllegalArgumentException, IOException;
+
+ /**
+ * Add a listener for observing when local and remote services are added. The caller may specify whether the listener
+ * should be notified of the complete list of currently registered services (set {@code onlyNew} to {@code false})
+ * or only services registered after the time of calling this method (set {@code onlyNew} to {@code true}).
+ *
+ * @param serviceListener the listener
+ * @param onlyNew {@code true} if only new registrations should be sent to the listener
+ * @return a handle which may be used to unregister the listener
+ */
+ SimpleCloseable addServiceListener(ServiceListener serviceListener, boolean onlyNew);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/HandleableCloseable.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,27 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.io.IOException;
-import java.io.Closeable;
-
-/**
- * A Remoting resource that can be closed.
- *
- * @param <T> the type that is passed to the close handler
- */
-public interface HandleableCloseable<T> extends Closeable {
-
- /**
- * Close, waiting for any outstanding processing to finish.
- *
- * @throws IOException if the close failed
- */
- void close() throws IOException;
-
- /**
- * Add a handler that will be called upon close. The handler may be called before or after the close acutally
- * takes place.
- *
- * @param handler the close handler
- */
- void addCloseHandler(CloseHandler<? super T> handler);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/HandleableCloseable.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/HandleableCloseable.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,27 @@
+package org.jboss.remoting;
+
+import java.io.IOException;
+import java.io.Closeable;
+
+/**
+ * A Remoting resource that can be closed.
+ *
+ * @param <T> the type that is passed to the close handler
+ */
+public interface HandleableCloseable<T> extends Closeable {
+
+ /**
+ * Close, waiting for any outstanding processing to finish.
+ *
+ * @throws IOException if the close failed
+ */
+ void close() throws IOException;
+
+ /**
+ * Add a handler that will be called upon close. The handler may be called before or after the close acutally
+ * takes place.
+ *
+ * @param handler the close handler
+ */
+ void addCloseHandler(CloseHandler<? super T> handler);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/IOExceptionCarrier.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/IOExceptionCarrier.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/IOExceptionCarrier.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,29 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.io.IOException;
-
-/**
- * A runtime exception that carries an {@link java.io.IOException} as a cause.
- */
-public class IOExceptionCarrier extends RuntimeException {
-
- private static final long serialVersionUID = -1602940590696531671L;
-
- /**
- * Construct a new carrier.
- *
- * @param cause the nested cause
- */
- public IOExceptionCarrier(IOException cause) {
- super(cause);
- }
-
- /**
- * Get the cause.
- *
- * @return the cause
- */
- public IOException getCause() {
- return (IOException) super.getCause();
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/IOExceptionCarrier.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/IOExceptionCarrier.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/IOExceptionCarrier.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/IOExceptionCarrier.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,29 @@
+package org.jboss.remoting;
+
+import java.io.IOException;
+
+/**
+ * A runtime exception that carries an {@link java.io.IOException} as a cause.
+ */
+public class IOExceptionCarrier extends RuntimeException {
+
+ private static final long serialVersionUID = -1602940590696531671L;
+
+ /**
+ * Construct a new carrier.
+ *
+ * @param cause the nested cause
+ */
+ public IOExceptionCarrier(IOException cause) {
+ super(cause);
+ }
+
+ /**
+ * Get the cause.
+ *
+ * @return the cause
+ */
+ public IOException getCause() {
+ return (IOException) super.getCause();
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/IndeterminateOutcomeException.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,48 +0,0 @@
-package org.jboss.cx.remoting;
-
-/**
- * An exception that is thrown when an operation terminates in such a way that the outcome cannot be known.
- */
-public class IndeterminateOutcomeException extends RemoteExecutionException {
-
- private static final long serialVersionUID = 6304843915977033800L;
-
- /**
- * Constructs a <tt>IndeterminateOutcomeException</tt> with no detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public IndeterminateOutcomeException() {
- }
-
- /**
- * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified detail message. The cause is not initialized,
- * and may subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public IndeterminateOutcomeException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public IndeterminateOutcomeException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public IndeterminateOutcomeException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/IndeterminateOutcomeException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/IndeterminateOutcomeException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,48 @@
+package org.jboss.remoting;
+
+/**
+ * An exception that is thrown when an operation terminates in such a way that the outcome cannot be known.
+ */
+public class IndeterminateOutcomeException extends RemoteExecutionException {
+
+ private static final long serialVersionUID = 6304843915977033800L;
+
+ /**
+ * Constructs a <tt>IndeterminateOutcomeException</tt> with no detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public IndeterminateOutcomeException() {
+ }
+
+ /**
+ * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified detail message. The cause is not initialized,
+ * and may subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public IndeterminateOutcomeException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public IndeterminateOutcomeException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>IndeterminateOutcomeException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public IndeterminateOutcomeException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RemoteExecutionException.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,68 +0,0 @@
-package org.jboss.cx.remoting;
-
-/**
- * Exception thrown when execution of a remote operation fails for some reason.
- */
-public class RemoteExecutionException extends RemotingException {
-
- private static final long serialVersionUID = 3580395686019440048L;
-
- /**
- * Constructs a <tt>RemoteExecutionException</tt> with no detail message.
- * The cause is not initialized, and may subsequently be
- * initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public RemoteExecutionException() {
- }
-
- /**
- * Constructs a <tt>RemoteExecutionException</tt> with the specified detail
- * message. The cause is not initialized, and may subsequently be
- * initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public RemoteExecutionException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>RemoteExecutionException</tt> with the specified cause.
- * The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of
- * <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method)
- */
- public RemoteExecutionException(Throwable cause) {
- super(cause);
- }
-
- /**
- * Constructs a <tt>RemoteExecutionException</tt> with the specified detail
- * message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method)
- */
- public RemoteExecutionException(String msg, Throwable cause) {
- super(msg, cause);
- }
-
- /**
- * Rethrow the cause, if it is a runtime exception. This is a convenience method to extract a runtime exception
- * from a remote execution exception.
- *
- * @throws RuntimeException the cause
- */
- public final void throwRuntime() throws RuntimeException {
- final Throwable cause = getCause();
- if (cause instanceof RuntimeException) {
- throw ((RuntimeException)cause);
- }
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RemoteExecutionException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteExecutionException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,68 @@
+package org.jboss.remoting;
+
+/**
+ * Exception thrown when execution of a remote operation fails for some reason.
+ */
+public class RemoteExecutionException extends RemotingException {
+
+ private static final long serialVersionUID = 3580395686019440048L;
+
+ /**
+ * Constructs a <tt>RemoteExecutionException</tt> with no detail message.
+ * The cause is not initialized, and may subsequently be
+ * initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public RemoteExecutionException() {
+ }
+
+ /**
+ * Constructs a <tt>RemoteExecutionException</tt> with the specified detail
+ * message. The cause is not initialized, and may subsequently be
+ * initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public RemoteExecutionException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>RemoteExecutionException</tt> with the specified cause.
+ * The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of
+ * <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the
+ * {@link #getCause()} method)
+ */
+ public RemoteExecutionException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * Constructs a <tt>RemoteExecutionException</tt> with the specified detail
+ * message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the
+ * {@link #getCause()} method)
+ */
+ public RemoteExecutionException(String msg, Throwable cause) {
+ super(msg, cause);
+ }
+
+ /**
+ * Rethrow the cause, if it is a runtime exception. This is a convenience method to extract a runtime exception
+ * from a remote execution exception.
+ *
+ * @throws RuntimeException the cause
+ */
+ public final void throwRuntime() throws RuntimeException {
+ final Throwable cause = getCause();
+ if (cause instanceof RuntimeException) {
+ throw ((RuntimeException)cause);
+ }
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteServiceRegistration.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RemoteServiceRegistration.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RemoteServiceRegistration.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.cx.remoting;
-
-/**
- *
- */
-public interface RemoteServiceRegistration extends HandleableCloseable<RemoteServiceRegistration> {
-}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RemotingException.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,51 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.io.IOException;
-
-/**
- * A general Remoting exception.
- */
-public class RemotingException extends IOException {
-
- private static final long serialVersionUID = 1540716301579397423L;
-
- /**
- * Constructs a <tt>RemotingException</tt> with no detail message. The cause is not initialized, and may subsequently be
- * initialized by a call to {@link #initCause(Throwable) initCause}.
- */
- public RemotingException() {
- }
-
- /**
- * Constructs a <tt>RemotingException</tt> with the specified detail message. The cause is not initialized, and may
- * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
- *
- * @param msg the detail message
- */
- public RemotingException(String msg) {
- super(msg);
- }
-
- /**
- * Constructs a <tt>RemotingException</tt> with the specified cause. The detail message is set to:
- * <pre>
- * (cause == null ? null : cause.toString())</pre>
- * (which typically contains the class and detail message of <tt>cause</tt>).
- *
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public RemotingException(Throwable cause) {
- initCause(cause);
- }
-
- /**
- * Constructs a <tt>RemotingException</tt> with the specified detail message and cause.
- *
- * @param msg the detail message
- * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
- */
- public RemotingException(String msg, Throwable cause) {
- super(msg);
- initCause(cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RemotingException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,51 @@
+package org.jboss.remoting;
+
+import java.io.IOException;
+
+/**
+ * A general Remoting exception.
+ */
+public class RemotingException extends IOException {
+
+ private static final long serialVersionUID = 1540716301579397423L;
+
+ /**
+ * Constructs a <tt>RemotingException</tt> with no detail message. The cause is not initialized, and may subsequently be
+ * initialized by a call to {@link #initCause(Throwable) initCause}.
+ */
+ public RemotingException() {
+ }
+
+ /**
+ * Constructs a <tt>RemotingException</tt> with the specified detail message. The cause is not initialized, and may
+ * subsequently be initialized by a call to {@link #initCause(Throwable) initCause}.
+ *
+ * @param msg the detail message
+ */
+ public RemotingException(String msg) {
+ super(msg);
+ }
+
+ /**
+ * Constructs a <tt>RemotingException</tt> with the specified cause. The detail message is set to:
+ * <pre>
+ * (cause == null ? null : cause.toString())</pre>
+ * (which typically contains the class and detail message of <tt>cause</tt>).
+ *
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public RemotingException(Throwable cause) {
+ initCause(cause);
+ }
+
+ /**
+ * Constructs a <tt>RemotingException</tt> with the specified detail message and cause.
+ *
+ * @param msg the detail message
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method)
+ */
+ public RemotingException(String msg, Throwable cause) {
+ super(msg);
+ initCause(cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingExceptionCarrier.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RemotingExceptionCarrier.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingExceptionCarrier.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,27 +0,0 @@
-package org.jboss.cx.remoting;
-
-/**
- * A runtime exception that carries a {@link org.jboss.cx.remoting.RemotingException} as a cause.
- */
-public class RemotingExceptionCarrier extends IOExceptionCarrier {
-
- private static final long serialVersionUID = -1326735788761007331L;
-
- /**
- * Construct a new carrier.
- *
- * @param cause the nested cause
- */
- public RemotingExceptionCarrier(RemotingException cause) {
- super(cause);
- }
-
- /**
- * Get the cause.
- *
- * @return the cause
- */
- public RemotingException getCause() {
- return (RemotingException) super.getCause();
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingExceptionCarrier.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RemotingExceptionCarrier.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingExceptionCarrier.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RemotingExceptionCarrier.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,27 @@
+package org.jboss.remoting;
+
+/**
+ * A runtime exception that carries a {@link org.jboss.remoting.RemotingException} as a cause.
+ */
+public class RemotingExceptionCarrier extends IOExceptionCarrier {
+
+ private static final long serialVersionUID = -1326735788761007331L;
+
+ /**
+ * Construct a new carrier.
+ *
+ * @param cause the nested cause
+ */
+ public RemotingExceptionCarrier(RemotingException cause) {
+ super(cause);
+ }
+
+ /**
+ * Get the cause.
+ *
+ * @return the cause
+ */
+ public RemotingException getCause() {
+ return (RemotingException) super.getCause();
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ReplyException.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.cx.remoting;
-
-/**
- *
- */
-public class ReplyException extends RemotingException {
-
- private static final long serialVersionUID = 5562116026829381932L;
-
- public ReplyException() {
- }
-
- public ReplyException(final String msg) {
- super(msg);
- }
-
- public ReplyException(final Throwable cause) {
- super(cause);
- }
-
- public ReplyException(final String msg, final Throwable cause) {
- super(msg, cause);
- }
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ReplyException.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ReplyException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.remoting;
+
+/**
+ *
+ */
+public class ReplyException extends RemotingException {
+
+ private static final long serialVersionUID = 5562116026829381932L;
+
+ public ReplyException() {
+ }
+
+ public ReplyException(final String msg) {
+ super(msg);
+ }
+
+ public ReplyException(final Throwable cause) {
+ super(cause);
+ }
+
+ public ReplyException(final String msg, final Throwable cause) {
+ super(msg, cause);
+ }
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RequestCancelHandler.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,16 +0,0 @@
-package org.jboss.cx.remoting;
-
-/**
- * A handler for request listeners to receive a notification when a request was cancelled.
- *
- * @param <O> the reply type
- */
-public interface RequestCancelHandler<O> {
-
- /**
- * Receive notification that the request was cancelled.
- *
- * @param requestContext the request context
- */
- void notifyCancel(RequestContext<O> requestContext);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RequestCancelHandler.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestCancelHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,16 @@
+package org.jboss.remoting;
+
+/**
+ * A handler for request listeners to receive a notification when a request was cancelled.
+ *
+ * @param <O> the reply type
+ */
+public interface RequestCancelHandler<O> {
+
+ /**
+ * Receive notification that the request was cancelled.
+ *
+ * @param requestContext the request context
+ */
+ void notifyCancel(RequestContext<O> requestContext);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RequestContext.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,69 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.util.concurrent.Executor;
-import java.io.IOException;
-
-/**
- * The context of a single request.
- *
- * @param <O> the reply type
- */
-public interface RequestContext<O> extends Executor {
- /**
- * Get the context that the request came in on.
- *
- * @return the context
- */
- ClientContext getContext();
-
- /**
- * Determine whether the current request was cancelled.
- *
- * @return {@code true} if the request was cancelled
- */
- boolean isCancelled();
-
- /**
- * Send a reply back to the caller.
- *
- * @param reply the reply to send
- * @throws IOException if the transmission failed
- * @throws IllegalStateException if a reply was already sent
- */
- void sendReply(O reply) throws IOException, IllegalStateException;
-
- /**
- * Send a failure message back to the caller.
- *
- * @param msg a message describing the failure, if any (can be {@code null})
- * @param cause the failure cause, if any (can be {@code null})
- *
- * @throws IOException if the transmission failed
- * @throws IllegalStateException if a reply was already sent
- */
- void sendFailure(String msg, Throwable cause) throws IOException, IllegalStateException;
-
- /**
- * Send a cancellation message back to the client.
- *
- * @throws IOException if the message could not be sent (the client could not be notified about the cancellation)
- * @throws IllegalStateException if a reply was already sent
- */
- void sendCancelled() throws IOException, IllegalStateException;
-
- /**
- * Add a notifier to be called if a cancel request is received. The notifier may be called from the current thread
- * or a different thread. If the request has already been cancelled, the notifier will be called immediately.
- *
- * @param handler the cancel handler
- */
- void addCancelHandler(RequestCancelHandler<O> handler);
-
- /**
- * Execute a task in the context of this request. This method can be used to continue execution of a request. Any
- * tasks submitted to this executor will be interruptible in the event of cancellation.
- *
- * @param command the task to execute
- */
- void execute(Runnable command);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RequestContext.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestContext.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,69 @@
+package org.jboss.remoting;
+
+import java.util.concurrent.Executor;
+import java.io.IOException;
+
+/**
+ * The context of a single request.
+ *
+ * @param <O> the reply type
+ */
+public interface RequestContext<O> extends Executor {
+ /**
+ * Get the context that the request came in on.
+ *
+ * @return the context
+ */
+ ClientContext getContext();
+
+ /**
+ * Determine whether the current request was cancelled.
+ *
+ * @return {@code true} if the request was cancelled
+ */
+ boolean isCancelled();
+
+ /**
+ * Send a reply back to the caller.
+ *
+ * @param reply the reply to send
+ * @throws IOException if the transmission failed
+ * @throws IllegalStateException if a reply was already sent
+ */
+ void sendReply(O reply) throws IOException, IllegalStateException;
+
+ /**
+ * Send a failure message back to the caller.
+ *
+ * @param msg a message describing the failure, if any (can be {@code null})
+ * @param cause the failure cause, if any (can be {@code null})
+ *
+ * @throws IOException if the transmission failed
+ * @throws IllegalStateException if a reply was already sent
+ */
+ void sendFailure(String msg, Throwable cause) throws IOException, IllegalStateException;
+
+ /**
+ * Send a cancellation message back to the client.
+ *
+ * @throws IOException if the message could not be sent (the client could not be notified about the cancellation)
+ * @throws IllegalStateException if a reply was already sent
+ */
+ void sendCancelled() throws IOException, IllegalStateException;
+
+ /**
+ * Add a notifier to be called if a cancel request is received. The notifier may be called from the current thread
+ * or a different thread. If the request has already been cancelled, the notifier will be called immediately.
+ *
+ * @param handler the cancel handler
+ */
+ void addCancelHandler(RequestCancelHandler<O> handler);
+
+ /**
+ * Execute a task in the context of this request. This method can be used to continue execution of a request. Any
+ * tasks submitted to this executor will be interruptible in the event of cancellation.
+ *
+ * @param command the task to execute
+ */
+ void execute(Runnable command);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RequestListener.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,51 +0,0 @@
-package org.jboss.cx.remoting;
-
-/**
- * A request listener. Implementations of this interface will reply to client requests.
- *
- * @param <I> the request type
- * @param <O> the reply type
- */
-public interface RequestListener<I, O> {
- /**
- * Handle the opening of a client.
- *
- * @param context the client context
- */
- void handleClientOpen(ClientContext context);
-
- /**
- * Handle the opening of a service.
- *
- * @param context the service context
- */
- void handleServiceOpen(ServiceContext context);
-
- /**
- * Handle a request. If this method throws {@code RemoteExecutionException}, then that exception is passed
- * back to the caller and the request is marked as complete. Otherwise, the request
- * listener must send back either a reply (using the {@code sendReply()} method on the {@code RequestContext}) or
- * an exception (using the {@code sendException()} method on the {@code RequestContext}). Failure to do so may
- * cause the client to hang indefinitely.
- *
- * @param context the context on which a reply may be sent
- * @param request the received request
- *
- * @throws RemoteExecutionException if the execution failed in some way
- */
- void handleRequest(RequestContext<O> context, I request) throws RemoteExecutionException;
-
- /**
- * Handle the close of a service.
- *
- * @param context the service context
- */
- void handleServiceClose(ServiceContext context);
-
- /**
- * Handle the close of a client.
- *
- * @param context the client context
- */
- void handleClientClose(ClientContext context);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/RequestListener.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/RequestListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,51 @@
+package org.jboss.remoting;
+
+/**
+ * A request listener. Implementations of this interface will reply to client requests.
+ *
+ * @param <I> the request type
+ * @param <O> the reply type
+ */
+public interface RequestListener<I, O> {
+ /**
+ * Handle the opening of a client.
+ *
+ * @param context the client context
+ */
+ void handleClientOpen(ClientContext context);
+
+ /**
+ * Handle the opening of a service.
+ *
+ * @param context the service context
+ */
+ void handleServiceOpen(ServiceContext context);
+
+ /**
+ * Handle a request. If this method throws {@code RemoteExecutionException}, then that exception is passed
+ * back to the caller and the request is marked as complete. Otherwise, the request
+ * listener must send back either a reply (using the {@code sendReply()} method on the {@code RequestContext}) or
+ * an exception (using the {@code sendException()} method on the {@code RequestContext}). Failure to do so may
+ * cause the client to hang indefinitely.
+ *
+ * @param context the context on which a reply may be sent
+ * @param request the received request
+ *
+ * @throws RemoteExecutionException if the execution failed in some way
+ */
+ void handleRequest(RequestContext<O> context, I request) throws RemoteExecutionException;
+
+ /**
+ * Handle the close of a service.
+ *
+ * @param context the service context
+ */
+ void handleServiceClose(ServiceContext context);
+
+ /**
+ * Handle the close of a client.
+ *
+ * @param context the client context
+ */
+ void handleClientClose(ClientContext context);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ServiceContext.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,17 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * The server-side context of a service. Used to hold state relating to a service (known as a {@code ContextSource} on
- * the client side).
- */
-public interface ServiceContext extends HandleableCloseable<ServiceContext> {
-
- /**
- * Get an attribute map which can be used to cache arbitrary state on the server side.
- *
- * @return the attribute map
- */
- ConcurrentMap<Object, Object> getAttributes();
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ServiceContext.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceContext.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,17 @@
+package org.jboss.remoting;
+
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * The server-side context of a service. Used to hold state relating to a service (known as a {@code ContextSource} on
+ * the client side).
+ */
+public interface ServiceContext extends HandleableCloseable<ServiceContext> {
+
+ /**
+ * Get an attribute map which can be used to cache arbitrary state on the server side.
+ *
+ * @return the attribute map
+ */
+ ConcurrentMap<Object, Object> getAttributes();
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ServiceListener.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,56 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.cx.remoting;
-
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-
-/**
- * A listener for watching service registrations on an endpoint.
- */
-public interface ServiceListener {
-
- /**
- * Receive notification that a local service was added. To receive a notification when it is closed, register a
- * close handler on the provided {@code requestHandlerSource} parameter.
- *
- * @param listenerHandle the handle to this listener
- * @param serviceType the service type string
- * @param groupName the group name string
- * @param requestHandlerSource the request handler source
- */
- void localServiceCreated(SimpleCloseable listenerHandle, String serviceType, String groupName, RequestHandlerSource requestHandlerSource);
-
- /**
- * Receive notification that a remote service was registered. To receive a notification when it is unregistered, register a
- * close handler on the provided {@code handle} parameter.
- *
- * @param listenerHandle the handle to this listener
- * @param endpointName the remote endpoint name
- * @param serviceType the service type string
- * @param groupName the group name string
- * @param metric the metric value
- * @param requestHandlerSource the request handler source
- * @param handle the handle to the registration
- */
- void remoteServiceRegistered(SimpleCloseable listenerHandle, String endpointName, String serviceType, String groupName, int metric, RequestHandlerSource requestHandlerSource, SimpleCloseable handle);
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/ServiceListener.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/ServiceListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.remoting;
+
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+
+/**
+ * A listener for watching service registrations on an endpoint.
+ */
+public interface ServiceListener {
+
+ /**
+ * Receive notification that a local service was added. To receive a notification when it is closed, register a
+ * close handler on the provided {@code requestHandlerSource} parameter.
+ *
+ * @param listenerHandle the handle to this listener
+ * @param serviceType the service type string
+ * @param groupName the group name string
+ * @param requestHandlerSource the request handler source
+ */
+ void localServiceCreated(SimpleCloseable listenerHandle, String serviceType, String groupName, RequestHandlerSource requestHandlerSource);
+
+ /**
+ * Receive notification that a remote service was registered. To receive a notification when it is unregistered, register a
+ * close handler on the provided {@code handle} parameter.
+ *
+ * @param listenerHandle the handle to this listener
+ * @param endpointName the remote endpoint name
+ * @param serviceType the service type string
+ * @param groupName the group name string
+ * @param metric the metric value
+ * @param requestHandlerSource the request handler source
+ * @param handle the handle to the registration
+ */
+ void remoteServiceRegistered(SimpleCloseable listenerHandle, String endpointName, String serviceType, String groupName, int metric, RequestHandlerSource requestHandlerSource, SimpleCloseable handle);
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/SimpleCloseable.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,29 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, 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.cx.remoting;
-
-/**
- * A simple close-only handle.
- */
-public interface SimpleCloseable extends HandleableCloseable<SimpleCloseable> {
-}
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/SimpleCloseable.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/SimpleCloseable.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,29 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, 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.remoting;
+
+/**
+ * A simple close-only handle.
+ */
+public interface SimpleCloseable extends HandleableCloseable<SimpleCloseable> {
+}
Deleted: remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/package-info.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +0,0 @@
-/**
- * The base Remoting 3 API package.
- */
-package org.jboss.cx.remoting;
\ No newline at end of file
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/package-info.java)
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java (rev 0)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/package-info.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,4 @@
+/**
+ * The base Remoting 3 API package.
+ */
+package org.jboss.remoting;
\ No newline at end of file
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi)
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractAutoCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/AbstractAutoCloseable.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractAutoCloseable.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,13 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi;
+package org.jboss.remoting.spi;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicInteger;
import java.io.IOException;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.spi.remote.Handle;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.spi.remote.Handle;
import org.jboss.xnio.log.Logger;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractHandleableCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/AbstractHandleableCloseable.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractHandleableCloseable.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,12 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi;
+package org.jboss.remoting.spi;
-import org.jboss.cx.remoting.HandleableCloseable;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.spi.SpiUtils;
+import org.jboss.remoting.HandleableCloseable;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.spi.SpiUtils;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
import java.util.HashSet;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractSimpleCloseable.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/AbstractSimpleCloseable.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/AbstractSimpleCloseable.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,9 +20,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi;
+package org.jboss.remoting.spi;
-import org.jboss.cx.remoting.SimpleCloseable;
+import org.jboss.remoting.SimpleCloseable;
import java.util.concurrent.Executor;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/SpiUtils.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/SpiUtils.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/SpiUtils.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,13 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi;
+package org.jboss.remoting.spi;
-import org.jboss.cx.remoting.spi.remote.ReplyHandler;
-import org.jboss.cx.remoting.spi.remote.RemoteRequestContext;
-import org.jboss.cx.remoting.RequestCancelHandler;
-import org.jboss.cx.remoting.RequestContext;
-import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.remoting.spi.remote.ReplyHandler;
+import org.jboss.remoting.spi.remote.RemoteRequestContext;
+import org.jboss.remoting.RequestCancelHandler;
+import org.jboss.remoting.RequestContext;
+import org.jboss.remoting.CloseHandler;
import org.jboss.xnio.log.Logger;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/package-info.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/package-info.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -24,4 +24,4 @@
* Service provider classes and interfaces. The classes are basic utility classes as well as abstract base classes
* to ease implementation.
*/
-package org.jboss.cx.remoting.spi;
+package org.jboss.remoting.spi;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/Handle.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/remote/Handle.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/Handle.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,10 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi.remote;
+package org.jboss.remoting.spi.remote;
-import org.jboss.cx.remoting.HandleableCloseable;
-import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.remoting.HandleableCloseable;
+import org.jboss.remoting.CloseHandler;
import java.io.IOException;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RemoteRequestContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/remote/RemoteRequestContext.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RemoteRequestContext.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi.remote;
+package org.jboss.remoting.spi.remote;
/**
* The context of an outstanding remote request. This instance should be discarded when a reply (of any sort)
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/ReplyHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/remote/ReplyHandler.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/ReplyHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi.remote;
+package org.jboss.remoting.spi.remote;
/**
* A handler for replies from a request. The handler should respect the first invocation made on it, and ignore
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RequestHandler.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/remote/RequestHandler.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RequestHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi.remote;
+package org.jboss.remoting.spi.remote;
-import org.jboss.cx.remoting.HandleableCloseable;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.remoting.HandleableCloseable;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.CloseHandler;
import java.io.IOException;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RequestHandlerSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/remote/RequestHandlerSource.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/RequestHandlerSource.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi.remote;
+package org.jboss.remoting.spi.remote;
-import org.jboss.cx.remoting.HandleableCloseable;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.remoting.HandleableCloseable;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.CloseHandler;
import java.io.IOException;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/remote/package-info.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/remote/package-info.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -23,4 +23,4 @@
/**
* Interfaces that provide the basic building blocks of remote access.
*/
-package org.jboss.cx.remoting.spi.remote;
+package org.jboss.remoting.spi.remote;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamContext.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamContext.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamContext.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi.stream;
+package org.jboss.remoting.spi.stream;
import java.util.concurrent.Executor;
import org.jboss.marshalling.MarshallerFactory;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamDetector.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamDetector.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamDetector.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.spi.stream;
+package org.jboss.remoting.spi.stream;
/**
* A class that can detect whether an object is streamable.
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamSerializerFactory.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/StreamSerializerFactory.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/StreamSerializerFactory.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.spi.stream;
+package org.jboss.remoting.spi.stream;
import org.jboss.xnio.IoHandler;
import org.jboss.xnio.ChannelSource;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/stream/package-info.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/stream/package-info.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
/**
* Classes related to streaming.
*/
-package org.jboss.cx.remoting.spi.stream;
+package org.jboss.remoting.spi.stream;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/ClientSourceWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ClientSourceWrapper.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/ClientSourceWrapper.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,9 +1,8 @@
-package org.jboss.cx.remoting.spi.wrapper;
+package org.jboss.remoting.spi.wrapper;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.ClientSource;
-import org.jboss.cx.remoting.RemotingException;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ClientSource;
import java.io.IOException;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/ClientWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/ClientWrapper.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/ClientWrapper.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,9 +1,9 @@
-package org.jboss.cx.remoting.spi.wrapper;
+package org.jboss.remoting.spi.wrapper;
import java.util.concurrent.ConcurrentMap;
import java.io.IOException;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.Client;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.Client;
import org.jboss.xnio.IoFuture;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/EndpointWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/EndpointWrapper.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/EndpointWrapper.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,17 +1,17 @@
-package org.jboss.cx.remoting.spi.wrapper;
+package org.jboss.remoting.spi.wrapper;
import java.util.concurrent.ConcurrentMap;
import java.io.IOException;
import java.net.URI;
-import org.jboss.cx.remoting.Endpoint;
-import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.ClientSource;
-import org.jboss.cx.remoting.SimpleCloseable;
-import org.jboss.cx.remoting.ServiceListener;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.Handle;
+import org.jboss.remoting.Endpoint;
+import org.jboss.remoting.RequestListener;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ClientSource;
+import org.jboss.remoting.SimpleCloseable;
+import org.jboss.remoting.ServiceListener;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.spi.remote.Handle;
import org.jboss.xnio.IoFuture;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/RequestContextWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/RequestContextWrapper.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/RequestContextWrapper.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,9 +1,8 @@
-package org.jboss.cx.remoting.spi.wrapper;
+package org.jboss.remoting.spi.wrapper;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.RequestCancelHandler;
-import org.jboss.cx.remoting.RequestContext;
-import org.jboss.cx.remoting.ClientContext;
+import org.jboss.remoting.RequestCancelHandler;
+import org.jboss.remoting.RequestContext;
+import org.jboss.remoting.ClientContext;
import java.io.IOException;
/**
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/spi/wrapper/package-info.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/spi/wrapper/package-info.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
/**
* Wrapper classes for various API elements.
*/
-package org.jboss.cx.remoting.spi.wrapper;
+package org.jboss.remoting.spi.wrapper;
Copied: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream (from rev 4572, remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream)
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ByteBufferInputStream.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/ByteBufferInputStream.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ByteBufferInputStream.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.InputStream;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ByteBufferOutputStream.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/ByteBufferOutputStream.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ByteBufferOutputStream.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.OutputStream;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/CharBufferReader.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/CharBufferReader.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/CharBufferReader.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.IOException;
import java.io.Reader;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/CharBufferWriter.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/CharBufferWriter.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/CharBufferWriter.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.IOException;
import java.io.Writer;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSink.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/ObjectSink.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSink.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.Closeable;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSinkWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/ObjectSinkWrapper.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSinkWrapper.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSource.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/ObjectSource.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSource.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.Closeable;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSourceWrapper.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/ObjectSourceWrapper.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/ObjectSourceWrapper.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/Streams.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/Streams.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/Streams.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import java.io.EOFException;
import java.io.IOException;
Modified: remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/package-info.java
===================================================================
--- remoting3/trunk/api/src/main/java/org/jboss/cx/remoting/stream/package-info.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/java/org/jboss/remoting/stream/package-info.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
/**
* Stream-related API classes.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
Modified: remoting3/trunk/api/src/main/resources/META-INF/jboss-classloading.xml
===================================================================
--- remoting3/trunk/api/src/main/resources/META-INF/jboss-classloading.xml 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/main/resources/META-INF/jboss-classloading.xml 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,14 +1,16 @@
-<classloading name="JBossRemotingAPI" version="3.0" xmlns="urn:jboss:classloading:1.0">
+<?xml version="1.0" encoding="UTF-8"?>
+
+<classloading name="JBossRemotingAPI" version="3.0.0" xmlns="urn:jboss:classloading:1.0">
<capabilities>
- <package name="org.jboss.remoting" version="3.0"/>
- <package name="org.jboss.remoting.spi" version="3.0"/>
- <package name="org.jboss.remoting.spi.remote" version="3.0"/>
- <package name="org.jboss.remoting.spi.stream" version="3.0"/>
- <package name="org.jboss.remoting.spi.wrapper" version="3.0"/>
- <package name="org.jboss.remoting.stream" version="3.0"/>
+ <package name="org.jboss.remoting" version="3.0.0"/>
+ <package name="org.jboss.remoting.spi" version="3.0.0"/>
+ <package name="org.jboss.remoting.spi.remote" version="3.0.0"/>
+ <package name="org.jboss.remoting.spi.stream" version="3.0.0"/>
+ <package name="org.jboss.remoting.spi.wrapper" version="3.0.0"/>
+ <package name="org.jboss.remoting.stream" version="3.0.0"/>
</capabilities>
<requirements>
- <module name="XnioAPI" from-inclusive="true" from="1.1" reExport="true"/>
- <module name="JBossMarshallingAPI" from-inclusive="true" from="1.0" reExport="true"/>
+ <module name="XnioAPI" from-inclusive="true" from="1.1.0" reExport="true"/>
+ <module name="JBossMarshallingAPI" from-inclusive="true" from="1.0.0" reExport="true"/>
</requirements>
-</classloading>
\ No newline at end of file
+</classloading>
Copied: remoting3/trunk/api/src/test/java/org/jboss/remoting (from rev 4566, remoting3/trunk/api/src/test/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/api/src/test/java/org/jboss/remoting/spi (from rev 4572, remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/spi)
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/CloseableTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/spi/CloseableTestCase.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/spi/CloseableTestCase.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.spi;
+package org.jboss.remoting.spi;
import junit.framework.TestCase;
import java.util.concurrent.Executors;
@@ -29,9 +29,9 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.jboss.xnio.IoUtils;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.test.support.LoggingHelper;
-import org.jboss.cx.remoting.spi.remote.Handle;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.test.support.LoggingHelper;
+import org.jboss.remoting.spi.remote.Handle;
/**
*
Copied: remoting3/trunk/api/src/test/java/org/jboss/remoting/stream (from rev 4572, remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/stream)
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/ByteBufferInputStreamTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/stream/ByteBufferInputStreamTestCase.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/ByteBufferInputStreamTestCase.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,13 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import junit.framework.TestCase;
import java.util.Arrays;
import java.nio.ByteBuffer;
-import org.jboss.cx.remoting.test.support.TestByteBufferAllocator;
-import org.jboss.cx.remoting.test.support.LoggingHelper;
+import org.jboss.remoting.test.support.TestByteBufferAllocator;
+import org.jboss.remoting.test.support.LoggingHelper;
/**
*
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/ByteBufferOutputStreamTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/stream/ByteBufferOutputStreamTestCase.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/ByteBufferOutputStreamTestCase.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import junit.framework.TestCase;
-import org.jboss.cx.remoting.test.support.TestByteBufferAllocator;
-import org.jboss.cx.remoting.test.support.LoggingHelper;
+import org.jboss.remoting.test.support.TestByteBufferAllocator;
+import org.jboss.remoting.test.support.LoggingHelper;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/CharBufferReaderTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/stream/CharBufferReaderTestCase.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/CharBufferReaderTestCase.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import junit.framework.TestCase;
-import org.jboss.cx.remoting.test.support.TestCharBufferAllocator;
-import org.jboss.cx.remoting.test.support.LoggingHelper;
+import org.jboss.remoting.test.support.TestCharBufferAllocator;
+import org.jboss.remoting.test.support.LoggingHelper;
import java.util.Arrays;
import java.nio.CharBuffer;
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/CharBufferWriterTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/stream/CharBufferWriterTestCase.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/CharBufferWriterTestCase.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,14 +20,14 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import junit.framework.TestCase;
import java.util.ArrayList;
import java.util.List;
import java.nio.CharBuffer;
-import org.jboss.cx.remoting.test.support.TestCharBufferAllocator;
-import org.jboss.cx.remoting.test.support.LoggingHelper;
+import org.jboss.remoting.test.support.TestCharBufferAllocator;
+import org.jboss.remoting.test.support.LoggingHelper;
/**
*
Modified: remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/StreamsTestCase.java
===================================================================
--- remoting3/trunk/api/src/test/java/org/jboss/cx/remoting/stream/StreamsTestCase.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/api/src/test/java/org/jboss/remoting/stream/StreamsTestCase.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.stream;
+package org.jboss.remoting.stream;
import junit.framework.TestCase;
import java.util.ArrayList;
@@ -28,7 +28,7 @@
import java.util.Arrays;
import java.util.Vector;
import java.io.EOFException;
-import org.jboss.cx.remoting.test.support.LoggingHelper;
+import org.jboss.remoting.test.support.LoggingHelper;
/**
*
Copied: remoting3/trunk/core/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/core/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/core/src/main/java/org/jboss/remoting/core (from rev 4572, remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core)
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/AbstractContextImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/AbstractContextImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,12 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
-import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.spi.AbstractHandleableCloseable;
+import org.jboss.remoting.util.CollectionUtil;
+import org.jboss.remoting.spi.AbstractHandleableCloseable;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ClientContextImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientContextImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,19 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.ClientContext;
-import org.jboss.cx.remoting.ServiceContext;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.spi.SpiUtils;
-import org.jboss.cx.remoting.util.CollectionUtil;
-import java.util.concurrent.ConcurrentMap;
+import org.jboss.remoting.ClientContext;
+import org.jboss.remoting.ServiceContext;
import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.Set;
-import java.util.HashSet;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ClientImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,15 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.core.util.QueueExecutor;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.ReplyHandler;
-import org.jboss.cx.remoting.spi.remote.RemoteRequestContext;
-import org.jboss.cx.remoting.spi.remote.Handle;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.core.util.QueueExecutor;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.ReplyHandler;
+import org.jboss.remoting.spi.remote.RemoteRequestContext;
+import org.jboss.remoting.spi.remote.Handle;
import org.jboss.xnio.IoFuture;
import java.util.concurrent.Executor;
import java.io.IOException;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ClientSourceImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ClientSourceImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,16 +20,16 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.ClientSource;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.Endpoint;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.Handle;
-import org.jboss.cx.remoting.spi.AbstractHandleableCloseable;
+import org.jboss.remoting.ClientSource;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.Endpoint;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.spi.remote.Handle;
+import org.jboss.remoting.spi.AbstractHandleableCloseable;
import org.jboss.xnio.IoUtils;
import java.io.IOException;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/EndpointImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/EndpointImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
@@ -11,22 +11,22 @@
import java.io.Closeable;
import java.io.IOException;
import java.net.URI;
-import org.jboss.cx.remoting.Endpoint;
-import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.ClientSource;
-import org.jboss.cx.remoting.SimpleCloseable;
-import org.jboss.cx.remoting.ServiceListener;
-import org.jboss.cx.remoting.util.OrderedExecutorFactory;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.Handle;
-import org.jboss.cx.remoting.spi.AbstractSimpleCloseable;
-import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.util.NamingThreadFactory;
-import org.jboss.cx.remoting.util.ServiceURI;
-import org.jboss.cx.remoting.version.Version;
+import org.jboss.remoting.Endpoint;
+import org.jboss.remoting.RequestListener;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ClientSource;
+import org.jboss.remoting.SimpleCloseable;
+import org.jboss.remoting.ServiceListener;
+import org.jboss.remoting.util.OrderedExecutorFactory;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.spi.remote.Handle;
+import org.jboss.remoting.spi.AbstractSimpleCloseable;
+import org.jboss.remoting.util.CollectionUtil;
+import org.jboss.remoting.util.NamingThreadFactory;
+import org.jboss.remoting.util.ServiceURI;
+import org.jboss.remoting.version.Version;
import org.jboss.xnio.log.Logger;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.IoFuture;
@@ -40,7 +40,7 @@
static {
// Print Remoting "greeting" message
- Logger.getLogger("org.jboss.cx.remoting").info("JBoss Remoting version %s", Version.VERSION);
+ Logger.getLogger("org.jboss.remoting").info("JBoss Remoting version %s", Version.VERSION);
}
private String name;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureClientSource.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/FutureClientSource.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureClientSource.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,13 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
import org.jboss.xnio.AbstractIoFuture;
import org.jboss.xnio.IoFuture;
import org.jboss.xnio.IoUtils;
-import org.jboss.cx.remoting.ClientSource;
-import org.jboss.cx.remoting.SimpleCloseable;
+import org.jboss.remoting.ClientSource;
+import org.jboss.remoting.SimpleCloseable;
import java.io.IOException;
/**
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureReplyImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/FutureReplyImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/FutureReplyImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.spi.remote.ReplyHandler;
-import org.jboss.cx.remoting.spi.remote.RemoteRequestContext;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.spi.remote.ReplyHandler;
+import org.jboss.remoting.spi.remote.RemoteRequestContext;
import org.jboss.xnio.AbstractIoFuture;
import org.jboss.xnio.IoFuture;
import java.util.concurrent.Executor;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/LocalRequestHandler.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,17 +20,17 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.RemoteRequestContext;
-import org.jboss.cx.remoting.spi.remote.ReplyHandler;
-import org.jboss.cx.remoting.spi.SpiUtils;
-import org.jboss.cx.remoting.spi.AbstractAutoCloseable;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.RemoteRequestContext;
+import org.jboss.remoting.spi.remote.ReplyHandler;
+import org.jboss.remoting.spi.SpiUtils;
+import org.jboss.remoting.spi.AbstractAutoCloseable;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.RequestListener;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.CloseHandler;
import org.jboss.xnio.log.Logger;
import java.util.concurrent.Executor;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/LocalRequestHandlerSource.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/LocalRequestHandlerSource.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,15 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.Handle;
-import org.jboss.cx.remoting.spi.AbstractAutoCloseable;
-import org.jboss.cx.remoting.RequestListener;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.Handle;
+import org.jboss.remoting.spi.AbstractAutoCloseable;
+import org.jboss.remoting.RequestListener;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.CloseHandler;
import org.jboss.xnio.log.Logger;
import java.util.concurrent.Executor;
import java.io.IOException;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/RequestContextImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/RequestContextImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,15 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.RequestContext;
-import org.jboss.cx.remoting.ClientContext;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.RequestCancelHandler;
-import org.jboss.cx.remoting.core.util.TaggingExecutor;
-import org.jboss.cx.remoting.spi.remote.ReplyHandler;
-import org.jboss.cx.remoting.spi.SpiUtils;
+import org.jboss.remoting.RequestContext;
+import org.jboss.remoting.ClientContext;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.RequestCancelHandler;
+import org.jboss.remoting.core.util.TaggingExecutor;
+import org.jboss.remoting.spi.remote.ReplyHandler;
+import org.jboss.remoting.spi.SpiUtils;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.Set;
import java.util.HashSet;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ServiceContextImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceContextImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,13 +20,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.ServiceContext;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.ClientContext;
-import java.util.concurrent.ConcurrentMap;
+import org.jboss.remoting.ServiceContext;
import java.util.concurrent.Executor;
/**
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceRegistration.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/ServiceRegistration.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/ServiceRegistration.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,10 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.SimpleCloseable;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.SimpleCloseable;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/DefaultStreamDetector.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/DefaultStreamDetector.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/DefaultStreamDetector.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,12 +1,11 @@
-package org.jboss.cx.remoting.core.stream;
+package org.jboss.remoting.core.stream;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Iterator;
-import org.jboss.cx.remoting.spi.stream.StreamDetector;
-import org.jboss.cx.remoting.spi.stream.StreamSerializerFactory;
-import org.jboss.cx.remoting.stream.ObjectSink;
-import org.jboss.cx.remoting.stream.ObjectSource;
+import org.jboss.remoting.spi.stream.StreamDetector;
+import org.jboss.remoting.spi.stream.StreamSerializerFactory;
+import org.jboss.remoting.stream.ObjectSink;
+import org.jboss.remoting.stream.ObjectSource;
/**
*
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/InputStreamStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/InputStreamStreamSerializerFactory.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/InputStreamStreamSerializerFactory.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.stream;
+package org.jboss.remoting.core.stream;
import java.io.IOException;
import java.io.InputStream;
@@ -7,8 +7,8 @@
import java.nio.ByteBuffer;
import java.util.concurrent.Executor;
import org.jboss.xnio.log.Logger;
-import org.jboss.cx.remoting.spi.stream.StreamSerializerFactory;
-import org.jboss.cx.remoting.spi.stream.StreamContext;
+import org.jboss.remoting.spi.stream.StreamSerializerFactory;
+import org.jboss.remoting.spi.stream.StreamContext;
import org.jboss.xnio.channels.AllocatedMessageChannel;
import org.jboss.xnio.channels.WritableMessageChannel;
import org.jboss.xnio.channels.ReadableAllocatedMessageChannel;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/ObjectSourceStreamSerializerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/ObjectSourceStreamSerializerFactory.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/ObjectSourceStreamSerializerFactory.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,13 +1,13 @@
-package org.jboss.cx.remoting.core.stream;
+package org.jboss.remoting.core.stream;
import java.io.IOException;
import java.util.concurrent.Executor;
import java.util.List;
import java.util.ArrayList;
import java.nio.ByteBuffer;
-import org.jboss.cx.remoting.spi.stream.StreamSerializerFactory;
-import org.jboss.cx.remoting.spi.stream.StreamContext;
-import org.jboss.cx.remoting.stream.ObjectSource;
+import org.jboss.remoting.spi.stream.StreamSerializerFactory;
+import org.jboss.remoting.spi.stream.StreamContext;
+import org.jboss.remoting.stream.ObjectSource;
import org.jboss.xnio.channels.AllocatedMessageChannel;
import org.jboss.xnio.IoHandler;
import org.jboss.xnio.ChannelSource;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/OutputStreamStreamSerailizerFactory.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/stream/OutputStreamStreamSerailizerFactory.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/stream/OutputStreamStreamSerailizerFactory.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.stream;
+package org.jboss.remoting.core.stream;
import java.io.IOException;
import java.io.OutputStream;
@@ -7,9 +7,9 @@
import java.nio.ByteBuffer;
import java.nio.channels.Channel;
import java.util.concurrent.Executor;
-import org.jboss.cx.remoting.spi.stream.StreamSerializerFactory;
-import org.jboss.cx.remoting.spi.stream.StreamContext;
-import org.jboss.cx.remoting.util.OrderedExecutor;
+import org.jboss.remoting.spi.stream.StreamSerializerFactory;
+import org.jboss.remoting.spi.stream.StreamContext;
+import org.jboss.remoting.util.OrderedExecutor;
import org.jboss.xnio.channels.AllocatedMessageChannel;
import org.jboss.xnio.channels.WritableMessageChannel;
import org.jboss.xnio.IoHandler;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/DecodingBuilder.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/util/DecodingBuilder.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/DecodingBuilder.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core.util;
+package org.jboss.remoting.core.util;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/QueueExecutor.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/util/QueueExecutor.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/QueueExecutor.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.util;
+package org.jboss.remoting.core.util;
import java.util.LinkedList;
import java.util.Queue;
Modified: remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/TaggingExecutor.java
===================================================================
--- remoting3/trunk/core/src/main/java/org/jboss/cx/remoting/core/util/TaggingExecutor.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/main/java/org/jboss/remoting/core/util/TaggingExecutor.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core.util;
+package org.jboss.remoting.core.util;
import java.util.concurrent.Executor;
import java.util.Set;
-import org.jboss.cx.remoting.util.CollectionUtil;
+import org.jboss.remoting.util.CollectionUtil;
/**
*
Copied: remoting3/trunk/core/src/test/java/org/jboss/remoting (from rev 4566, remoting3/trunk/core/src/test/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/core/src/test/java/org/jboss/remoting/core (from rev 4572, remoting3/trunk/core/src/test/java/org/jboss/cx/remoting/core)
Modified: remoting3/trunk/core/src/test/java/org/jboss/remoting/core/EndpointTestCase.java
===================================================================
--- remoting3/trunk/core/src/test/java/org/jboss/cx/remoting/core/EndpointTestCase.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/core/src/test/java/org/jboss/remoting/core/EndpointTestCase.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.core;
+package org.jboss.remoting.core;
import junit.framework.TestCase;
import java.util.concurrent.Executors;
@@ -28,14 +28,14 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.io.IOException;
-import org.jboss.cx.remoting.AbstractRequestListener;
-import org.jboss.cx.remoting.RequestContext;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.test.support.LoggingHelper;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.Handle;
+import org.jboss.remoting.AbstractRequestListener;
+import org.jboss.remoting.RequestContext;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.test.support.LoggingHelper;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.Handle;
import org.jboss.xnio.IoUtils;
/**
Copied: remoting3/trunk/http/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/http/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/http/src/main/java/org/jboss/remoting/http (from rev 4572, remoting3/trunk/http/src/main/java/org/jboss/cx/remoting/http)
Copied: remoting3/trunk/http-se6/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/http-se6/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/http-se6/src/main/java/org/jboss/remoting/http (from rev 4572, remoting3/trunk/http-se6/src/main/java/org/jboss/cx/remoting/http)
Copied: remoting3/trunk/http-servlet/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/http-servlet/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/http-servlet/src/main/java/org/jboss/remoting/http (from rev 4572, remoting3/trunk/http-servlet/src/main/java/org/jboss/cx/remoting/http)
Copied: remoting3/trunk/http-urlconnection/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/http-urlconnection/src/main/java/org/jboss/remoting/http (from rev 4572, remoting3/trunk/http-urlconnection/src/main/java/org/jboss/cx/remoting/http)
Copied: remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/mc-deployers/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/beans (from rev 4572, remoting3/trunk/mc-deployers/src/main/java/org/jboss/cx/remoting/beans)
Copied: remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata (from rev 4572, remoting3/trunk/mc-deployers/src/main/java/org/jboss/cx/remoting/metadata)
Modified: remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/EndpointMetaData.java
===================================================================
--- remoting3/trunk/mc-deployers/src/main/java/org/jboss/cx/remoting/metadata/EndpointMetaData.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/EndpointMetaData.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,11 +1,11 @@
-package org.jboss.cx.remoting.metadata;
+package org.jboss.remoting.metadata;
import java.io.Serializable;
import java.util.List;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.cx.remoting.util.CollectionUtil;
+import org.jboss.remoting.util.CollectionUtil;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
@@ -14,7 +14,7 @@
/**
* Metadata that describes the creation of a Remoting endpoint.
*
- * @see org.jboss.cx.remoting.Endpoint
+ * @see org.jboss.remoting.Endpoint
*/
@XmlType(name = "endpoint")
public class EndpointMetaData implements BeanMetaDataFactory, Serializable {
@@ -66,7 +66,7 @@
/**
* Get the name of the root request listener bean for this endpoint. The name should be associated with a bean
- * that implements {@link org.jboss.cx.remoting.RequestListener}.
+ * that implements {@link org.jboss.remoting.RequestListener}.
*
* @return the name of root request listener bean
*/
@@ -76,7 +76,7 @@
/**
* Set the name of the root request listener bean for this endpoint. The name should be associated with a bean
- * that implements {@link org.jboss.cx.remoting.RequestListener}.
+ * that implements {@link org.jboss.remoting.RequestListener}.
*
* @param rootRequestListenerName the name of the root request listener bean
*/
@@ -115,7 +115,7 @@
private BeanMetaData buildCoreEndpointMetaData(final String coreEndpointName) {
final BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(coreEndpointName);
builder.addConstructorParameter("java.lang.String", name);
- builder.addConstructorParameter("org.jboss.cx.remoting.RequestListener", builder.createInject(rootRequestListenerName));
+ builder.addConstructorParameter("org.jboss.remoting.RequestListener", builder.createInject(rootRequestListenerName));
builder.addPropertyMetaData("executor", builder.createInject(executorName));
return builder.getBeanMetaData();
}
Modified: remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/RemotingMetaData.java
===================================================================
--- remoting3/trunk/mc-deployers/src/main/java/org/jboss/cx/remoting/metadata/RemotingMetaData.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/RemotingMetaData.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.metadata;
+package org.jboss.remoting.metadata;
import java.io.Serializable;
import java.util.ArrayList;
@@ -6,7 +6,7 @@
import java.util.List;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
-import org.jboss.cx.remoting.util.CollectionUtil;
+import org.jboss.remoting.util.CollectionUtil;
import org.jboss.xb.annotations.JBossXmlSchema;
import javax.xml.bind.annotation.XmlElement;
Modified: remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/SessionMetaData.java
===================================================================
--- remoting3/trunk/mc-deployers/src/main/java/org/jboss/cx/remoting/metadata/SessionMetaData.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/SessionMetaData.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,13 +1,13 @@
-package org.jboss.cx.remoting.metadata;
+package org.jboss.remoting.metadata;
import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
-import org.jboss.cx.remoting.util.AttributeMap;
-import org.jboss.cx.remoting.util.AttributeHashMap;
-import org.jboss.cx.remoting.util.AttributeKey;
-import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.CommonKeys;
+import org.jboss.remoting.util.AttributeMap;
+import org.jboss.remoting.util.AttributeHashMap;
+import org.jboss.remoting.util.AttributeKey;
+import org.jboss.remoting.util.CollectionUtil;
+import org.jboss.remoting.CommonKeys;
import java.io.Serializable;
import java.util.List;
import java.net.URI;
Modified: remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/SessionMetaDataAttribute.java
===================================================================
--- remoting3/trunk/mc-deployers/src/main/java/org/jboss/cx/remoting/metadata/SessionMetaDataAttribute.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/mc-deployers/src/main/java/org/jboss/remoting/metadata/SessionMetaDataAttribute.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.metadata;
+package org.jboss.remoting.metadata;
import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlAttribute;
Modified: remoting3/trunk/mc-deployers/src/main/resources/META-INF/remoting-deployer-beans.xml
===================================================================
--- remoting3/trunk/mc-deployers/src/main/resources/META-INF/remoting-deployer-beans.xml 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/mc-deployers/src/main/resources/META-INF/remoting-deployer-beans.xml 2008-09-18 03:06:39 UTC (rev 4573)
@@ -6,7 +6,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<bean name="RemotingMetaDataParser" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
<constructor>
- <parameter>org.jboss.cx.remoting.metadata.RemotingMetaData</parameter>
+ <parameter>org.jboss.remoting.metadata.RemotingMetaData</parameter>
</constructor>
<property name="name">jboss-remoting.xml</property>
<property name="registerWithJBossXB">true</property>
Copied: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol (from rev 4572, remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol)
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/AbstractConnection.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/AbstractConnection.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/AbstractConnection.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,9 +20,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
-import org.jboss.cx.remoting.spi.AbstractSimpleCloseable;
+import org.jboss.remoting.spi.AbstractSimpleCloseable;
import java.util.concurrent.Executor;
/**
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicHandler.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/BasicHandler.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,26 +20,26 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
import org.jboss.xnio.channels.AllocatedMessageChannel;
import org.jboss.xnio.IoHandler;
import org.jboss.xnio.BufferAllocator;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.log.Logger;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.ReplyHandler;
-import org.jboss.cx.remoting.spi.remote.RemoteRequestContext;
-import org.jboss.cx.remoting.spi.remote.Handle;
-import org.jboss.cx.remoting.spi.SpiUtils;
-import org.jboss.cx.remoting.spi.AbstractAutoCloseable;
-import static org.jboss.cx.remoting.util.CollectionUtil.concurrentIntegerMap;
-import org.jboss.cx.remoting.util.CollectionUtil;
-import org.jboss.cx.remoting.util.ConcurrentIntegerMap;
-import org.jboss.cx.remoting.CloseHandler;
-import org.jboss.cx.remoting.Endpoint;
-import org.jboss.cx.remoting.SimpleCloseable;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.spi.remote.ReplyHandler;
+import org.jboss.remoting.spi.remote.RemoteRequestContext;
+import org.jboss.remoting.spi.remote.Handle;
+import org.jboss.remoting.spi.SpiUtils;
+import org.jboss.remoting.spi.AbstractAutoCloseable;
+import static org.jboss.remoting.util.CollectionUtil.concurrentIntegerMap;
+import org.jboss.remoting.util.CollectionUtil;
+import org.jboss.remoting.util.ConcurrentIntegerMap;
+import org.jboss.remoting.CloseHandler;
+import org.jboss.remoting.Endpoint;
+import org.jboss.remoting.SimpleCloseable;
import org.jboss.marshalling.MarshallerFactory;
import org.jboss.marshalling.ByteInput;
import org.jboss.marshalling.Unmarshaller;
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicProtocol.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/BasicProtocol.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/BasicProtocol.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,12 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
-import org.jboss.cx.remoting.RemotingException;
-import org.jboss.cx.remoting.SimpleCloseable;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.Handle;
+import org.jboss.remoting.RemotingException;
+import org.jboss.remoting.SimpleCloseable;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.spi.remote.Handle;
import org.jboss.xnio.IoHandlerFactory;
import org.jboss.xnio.ChannelSource;
import org.jboss.xnio.IoFuture;
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/ConfigValue.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ConfigValue.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/ConfigValue.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
/**
*
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/ConnectionListener.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/ConnectionListener.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/ConnectionListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,9 +20,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
-import org.jboss.cx.remoting.SimpleCloseable;
+import org.jboss.remoting.SimpleCloseable;
/**
*
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/MessageType.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/MessageType.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/MessageType.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
/**
* The type of a protocol message.
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/RemotingChannelConfiguration.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/RemotingChannelConfiguration.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/RemotingChannelConfiguration.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
import java.util.concurrent.Executor;
import java.nio.ByteBuffer;
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/SimpleWriteHandler.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/SimpleWriteHandler.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/SimpleWriteHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
import java.io.IOException;
import java.nio.ByteBuffer;
Modified: remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/WriteHandler.java
===================================================================
--- remoting3/trunk/protocol/basic/src/main/java/org/jboss/cx/remoting/protocol/basic/WriteHandler.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/main/java/org/jboss/remoting/protocol/basic/WriteHandler.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
import org.jboss.xnio.channels.WritableMessageChannel;
Copied: remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting (from rev 4566, remoting3/trunk/protocol/basic/src/test/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol (from rev 4572, remoting3/trunk/protocol/basic/src/test/java/org/jboss/cx/remoting/protocol)
Modified: remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/ConnectionTestCase.java
===================================================================
--- remoting3/trunk/protocol/basic/src/test/java/org/jboss/cx/remoting/protocol/basic/ConnectionTestCase.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/protocol/basic/src/test/java/org/jboss/remoting/protocol/basic/ConnectionTestCase.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.protocol.basic;
+package org.jboss.remoting.protocol.basic;
import java.nio.ByteBuffer;
import java.util.Collections;
@@ -28,33 +28,14 @@
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import java.net.InetSocketAddress;
-import java.io.Closeable;
-import java.io.IOException;
import junit.framework.TestCase;
-import org.jboss.cx.remoting.core.EndpointImpl;
-import org.jboss.cx.remoting.test.support.LoggingHelper;
-import org.jboss.cx.remoting.RequestContext;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.ClientSource;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.AbstractRequestListener;
-import org.jboss.cx.remoting.SimpleCloseable;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.Handle;
+import org.jboss.remoting.core.EndpointImpl;
+import org.jboss.remoting.test.support.LoggingHelper;
import org.jboss.xnio.BufferAllocator;
import org.jboss.xnio.IoUtils;
import org.jboss.xnio.Xnio;
-import org.jboss.xnio.IoHandlerFactory;
-import org.jboss.xnio.IoFuture;
-import org.jboss.xnio.TcpClient;
-import org.jboss.xnio.ChannelSource;
-import org.jboss.xnio.CloseableTcpConnector;
import org.jboss.xnio.CloseableExecutor;
import org.jboss.xnio.nio.NioXnio;
-import org.jboss.xnio.channels.AllocatedMessageChannel;
-import org.jboss.xnio.channels.Channels;
-import org.jboss.xnio.channels.StreamChannel;
/**
*
Copied: remoting3/trunk/samples/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples (from rev 4572, remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples)
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalBasicExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalBasicExampleMain.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalBasicExampleMain.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,12 +1,12 @@
-package org.jboss.cx.remoting.samples.simple;
+package org.jboss.remoting.samples.simple;
import java.io.IOException;
import java.security.Security;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.Endpoint;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.Remoting;
-import org.jboss.cx.remoting.core.security.sasl.Provider;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.Endpoint;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.Remoting;
+import org.jboss.remoting.core.security.sasl.Provider;
import org.jboss.xnio.IoUtils;
/**
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalStreamExampleMain.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/LocalStreamExampleMain.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/LocalStreamExampleMain.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,15 +1,15 @@
-package org.jboss.cx.remoting.samples.simple;
+package org.jboss.remoting.samples.simple;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.security.Security;
-import org.jboss.cx.remoting.Client;
-import org.jboss.cx.remoting.Endpoint;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.Remoting;
-import org.jboss.cx.remoting.core.security.sasl.Provider;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.Endpoint;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.Remoting;
+import org.jboss.remoting.core.security.sasl.Provider;
import org.jboss.xnio.IoUtils;
/**
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/StreamingRot13RequestListener.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/StreamingRot13RequestListener.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/StreamingRot13RequestListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,10 +1,10 @@
-package org.jboss.cx.remoting.samples.simple;
+package org.jboss.remoting.samples.simple;
import java.io.IOException;
import java.io.Reader;
-import org.jboss.cx.remoting.AbstractRequestListener;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.RequestContext;
+import org.jboss.remoting.AbstractRequestListener;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.RequestContext;
/**
*
Modified: remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/StringRot13RequestListener.java
===================================================================
--- remoting3/trunk/samples/src/main/java/org/jboss/cx/remoting/samples/simple/StringRot13RequestListener.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/samples/src/main/java/org/jboss/remoting/samples/simple/StringRot13RequestListener.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,8 +1,8 @@
-package org.jboss.cx.remoting.samples.simple;
+package org.jboss.remoting.samples.simple;
-import org.jboss.cx.remoting.AbstractRequestListener;
-import org.jboss.cx.remoting.RemoteExecutionException;
-import org.jboss.cx.remoting.RequestContext;
+import org.jboss.remoting.AbstractRequestListener;
+import org.jboss.remoting.RemoteExecutionException;
+import org.jboss.remoting.RequestContext;
import java.io.IOException;
/**
Copied: remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/sasl-null/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core (from rev 4572, remoting3/trunk/sasl-null/src/main/java/org/jboss/cx/remoting/core)
Modified: remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslClientImpl.java
===================================================================
--- remoting3/trunk/sasl-null/src/main/java/org/jboss/cx/remoting/core/security/sasl/NullSaslClientImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslClientImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import javax.security.sasl.SaslClient;
import javax.security.sasl.SaslException;
Modified: remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslFactoryImpl.java
===================================================================
--- remoting3/trunk/sasl-null/src/main/java/org/jboss/cx/remoting/core/security/sasl/NullSaslFactoryImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslFactoryImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.util.Map;
Modified: remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslServerImpl.java
===================================================================
--- remoting3/trunk/sasl-null/src/main/java/org/jboss/cx/remoting/core/security/sasl/NullSaslServerImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/sasl-null/src/main/java/org/jboss/remoting/core/security/sasl/NullSaslServerImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
Copied: remoting3/trunk/srp/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core (from rev 4572, remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core)
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/AbstractSrpSaslParticipant.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/AbstractSrpSaslParticipant.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/AbstractSrpSaslParticipant.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/BufferFactory.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/BufferFactory.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/BufferFactory.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.nio.ByteBuffer;
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/NioSaslEndpoint.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/NioSaslEndpoint.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/NioSaslEndpoint.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.nio.ByteBuffer;
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/Provider.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/Provider.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/Provider.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
/**
*
@@ -9,7 +9,7 @@
public Provider() {
super("JBossRemotingSASL", 3.0, "JBoss Remoting simple default SASL provider (provides SRP mechanism)");
- put("SaslClientFactory.SRP", "org.jboss.cx.remoting.core.security.sasl.SrpSaslClientFactoryImpl");
- put("SaslServerFactory.SRP", "org.jboss.cx.remoting.core.security.sasl.SrpSaslServerFactoryImpl");
+ put("SaslClientFactory.SRP", "org.jboss.remoting.core.security.sasl.SrpSaslClientFactoryImpl");
+ put("SaslServerFactory.SRP", "org.jboss.remoting.core.security.sasl.SrpSaslServerFactoryImpl");
}
}
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/Srp.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/Srp.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/Srp.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.security.Permission;
import java.security.SecurityPermission;
@@ -7,8 +7,8 @@
*
*/
public final class Srp {
- public static final String SESSION_KEY = "org.jboss.cx.remoting.sasl.srp.sessionkey";
- public static final String VERIFIER_MODE = "org.jboss.cx.remoting.sasl.srp.verifier";
+ public static final String SESSION_KEY = "org.jboss.remoting.sasl.srp.sessionkey";
+ public static final String VERIFIER_MODE = "org.jboss.remoting.sasl.srp.verifier";
public static final Permission SESSION_KEY_PERMISSION = new SecurityPermission("getSessionKey");
}
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpOptions.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpOptions.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpOptions.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.util.LinkedHashSet;
import java.util.Set;
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslClientFactoryImpl.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpSaslClientFactoryImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslClientFactoryImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.util.Map;
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslClientImpl.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpSaslClientImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslClientImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.math.BigInteger;
import java.nio.ByteBuffer;
@@ -10,7 +10,7 @@
import java.util.Map;
import java.util.Random;
import java.util.Set;
-import org.jboss.cx.remoting.util.CollectionUtil;
+import org.jboss.remoting.util.CollectionUtil;
import org.jboss.xnio.log.Logger;
import javax.crypto.NoSuchPaddingException;
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslServerFactoryImpl.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpSaslServerFactoryImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslServerFactoryImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.util.Map;
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslServerImpl.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpSaslServerImpl.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpSaslServerImpl.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.io.IOException;
import java.math.BigInteger;
@@ -13,8 +13,8 @@
import java.util.Map;
import java.util.Random;
import java.util.Set;
-import org.jboss.cx.remoting.util.Base64DecodingException;
-import org.jboss.cx.remoting.util.CollectionUtil;
+import org.jboss.remoting.util.Base64DecodingException;
+import org.jboss.remoting.util.CollectionUtil;
import org.jboss.xnio.log.Logger;
import javax.crypto.NoSuchPaddingException;
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpVerifier.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpVerifier.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpVerifier.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import java.io.Serializable;
import java.math.BigInteger;
@@ -10,8 +10,8 @@
import java.security.NoSuchAlgorithmException;
import java.util.Random;
import java.util.Set;
-import org.jboss.cx.remoting.util.Base64DecodingException;
-import org.jboss.cx.remoting.util.Base64Util;
+import org.jboss.remoting.util.Base64DecodingException;
+import org.jboss.remoting.util.Base64Util;
/**
*
Modified: remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpVerifierCallback.java
===================================================================
--- remoting3/trunk/srp/src/main/java/org/jboss/cx/remoting/core/security/sasl/SrpVerifierCallback.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/srp/src/main/java/org/jboss/remoting/core/security/sasl/SrpVerifierCallback.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.core.security.sasl;
+package org.jboss.remoting.core.security.sasl;
import javax.security.auth.callback.Callback;
Copied: remoting3/trunk/standalone/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting)
Deleted: remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java
===================================================================
--- remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java 2008-09-11 19:54:37 UTC (rev 4566)
+++ remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,56 +0,0 @@
-package org.jboss.cx.remoting;
-
-import java.io.IOException;
-import org.jboss.cx.remoting.core.EndpointImpl;
-import org.jboss.cx.remoting.spi.remote.RequestHandler;
-import org.jboss.cx.remoting.spi.remote.RequestHandlerSource;
-import org.jboss.cx.remoting.spi.remote.Handle;
-import org.jboss.xnio.IoUtils;
-
-/**
- *
- */
-public final class Remoting {
- // lifecycle lock
- private static final Object lifecycle = new Object();
-
- public static Endpoint createEndpoint(String name) throws IOException {
- synchronized (lifecycle) {
- final EndpointImpl endpointImpl = new EndpointImpl();
- endpointImpl.setName(name);
- endpointImpl.start();
- return endpointImpl;
- }
- }
-
- public static void closeEndpoint(Endpoint endpoint) {
- synchronized (lifecycle) {
- if (endpoint instanceof EndpointImpl) {
- final EndpointImpl endpointImpl = (EndpointImpl) endpoint;
- endpointImpl.stop();
- }
- }
- }
-
- public static <I, O> Client<I, O> createLocalClient(Endpoint endpoint, RequestListener<I, O> requestListener) throws IOException {
- final Handle<RequestHandler> handle = endpoint.createRequestHandler(requestListener);
- try {
- return endpoint.createClient(handle.getResource());
- } finally {
- IoUtils.safeClose(handle);
- }
- }
-
- public static <I, O> ClientSource<I, O> createLocalClientSource(Endpoint endpoint, RequestListener<I, O> requestListener, final String serviceType, final String groupName) throws IOException {
- final Handle<RequestHandlerSource> handle = endpoint.createRequestHandlerSource(requestListener, serviceType, groupName);
- try {
- return endpoint.createClientSource(handle.getResource());
- } finally {
- IoUtils.safeClose(handle);
- }
- }
-
- // privates
-
- private Remoting() { /* empty */ }
-}
Copied: remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java (from rev 4572, remoting3/trunk/standalone/src/main/java/org/jboss/cx/remoting/Remoting.java)
===================================================================
--- remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java (rev 0)
+++ remoting3/trunk/standalone/src/main/java/org/jboss/remoting/Remoting.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -0,0 +1,56 @@
+package org.jboss.remoting;
+
+import java.io.IOException;
+import org.jboss.remoting.core.EndpointImpl;
+import org.jboss.remoting.spi.remote.RequestHandler;
+import org.jboss.remoting.spi.remote.RequestHandlerSource;
+import org.jboss.remoting.spi.remote.Handle;
+import org.jboss.xnio.IoUtils;
+
+/**
+ *
+ */
+public final class Remoting {
+ // lifecycle lock
+ private static final Object lifecycle = new Object();
+
+ public static Endpoint createEndpoint(String name) throws IOException {
+ synchronized (lifecycle) {
+ final EndpointImpl endpointImpl = new EndpointImpl();
+ endpointImpl.setName(name);
+ endpointImpl.start();
+ return endpointImpl;
+ }
+ }
+
+ public static void closeEndpoint(Endpoint endpoint) {
+ synchronized (lifecycle) {
+ if (endpoint instanceof EndpointImpl) {
+ final EndpointImpl endpointImpl = (EndpointImpl) endpoint;
+ endpointImpl.stop();
+ }
+ }
+ }
+
+ public static <I, O> Client<I, O> createLocalClient(Endpoint endpoint, RequestListener<I, O> requestListener) throws IOException {
+ final Handle<RequestHandler> handle = endpoint.createRequestHandler(requestListener);
+ try {
+ return endpoint.createClient(handle.getResource());
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ }
+
+ public static <I, O> ClientSource<I, O> createLocalClientSource(Endpoint endpoint, RequestListener<I, O> requestListener, final String serviceType, final String groupName) throws IOException {
+ final Handle<RequestHandlerSource> handle = endpoint.createRequestHandlerSource(requestListener, serviceType, groupName);
+ try {
+ return endpoint.createClientSource(handle.getResource());
+ } finally {
+ IoUtils.safeClose(handle);
+ }
+ }
+
+ // privates
+
+ private Remoting() { /* empty */ }
+}
Copied: remoting3/trunk/testing-support/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/testing-support/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test (from rev 4572, remoting3/trunk/testing-support/src/main/java/org/jboss/cx/remoting/test)
Modified: remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/LoggingHelper.java
===================================================================
--- remoting3/trunk/testing-support/src/main/java/org/jboss/cx/remoting/test/support/LoggingHelper.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/LoggingHelper.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.test.support;
+package org.jboss.remoting.test.support;
import java.security.AccessController;
import java.security.PrivilegedAction;
Modified: remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/LoggingSecurityManager.java
===================================================================
--- remoting3/trunk/testing-support/src/main/java/org/jboss/cx/remoting/test/support/LoggingSecurityManager.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/LoggingSecurityManager.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.test.support;
+package org.jboss.remoting.test.support;
import java.security.Permission;
import java.io.FileDescriptor;
Modified: remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/TestByteBufferAllocator.java
===================================================================
--- remoting3/trunk/testing-support/src/main/java/org/jboss/cx/remoting/test/support/TestByteBufferAllocator.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/TestByteBufferAllocator.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.test.support;
+package org.jboss.remoting.test.support;
import java.nio.ByteBuffer;
import java.util.concurrent.atomic.AtomicInteger;
Modified: remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/TestCharBufferAllocator.java
===================================================================
--- remoting3/trunk/testing-support/src/main/java/org/jboss/cx/remoting/test/support/TestCharBufferAllocator.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/testing-support/src/main/java/org/jboss/remoting/test/support/TestCharBufferAllocator.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.test.support;
+package org.jboss.remoting.test.support;
import java.nio.CharBuffer;
import java.util.concurrent.atomic.AtomicInteger;
Copied: remoting3/trunk/tools/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/tools/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/tools/src/main/java/org/jboss/remoting/tools (from rev 4572, remoting3/trunk/tools/src/main/java/org/jboss/cx/remoting/tools)
Modified: remoting3/trunk/tools/src/main/java/org/jboss/remoting/tools/PasswordEncoder.java
===================================================================
--- remoting3/trunk/tools/src/main/java/org/jboss/cx/remoting/tools/PasswordEncoder.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/tools/src/main/java/org/jboss/remoting/tools/PasswordEncoder.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.tools;
+package org.jboss.remoting.tools;
import java.io.Console;
import java.nio.CharBuffer;
@@ -7,7 +7,7 @@
import java.util.Collection;
import java.util.Iterator;
import java.util.TreeSet;
-import org.jboss.cx.remoting.core.security.sasl.SrpVerifier;
+import org.jboss.remoting.core.security.sasl.SrpVerifier;
/**
*
Copied: remoting3/trunk/util/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/util/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/util/src/main/java/org/jboss/remoting/util (from rev 4572, remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util)
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AtomicMap.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AtomicMap.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AtomicMap.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Collection;
import java.util.Map;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AtomicStateMachine.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AtomicStateMachine.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AtomicStateMachine.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.concurrent.TimeUnit;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeHashMap.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AttributeHashMap.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeHashMap.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Collection;
import java.util.Iterator;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeKey.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AttributeKey.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeKey.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
/**
*
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeMap.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/AttributeMap.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/AttributeMap.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Collection;
import java.util.Set;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Base64DecodingException.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/Base64DecodingException.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Base64DecodingException.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
/**
*
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Base64Util.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/Base64Util.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Base64Util.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.nio.ByteBuffer;
import java.nio.CharBuffer;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/CollectionUtil.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/CollectionUtil.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/CollectionUtil.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.lang.reflect.Array;
import java.util.ArrayList;
@@ -22,8 +22,8 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import static org.jboss.cx.remoting.util.ConcurrentReferenceHashMap.ReferenceType.STRONG;
-import static org.jboss.cx.remoting.util.ConcurrentReferenceHashMap.ReferenceType.WEAK;
+import static org.jboss.remoting.util.ConcurrentReferenceHashMap.ReferenceType.STRONG;
+import static org.jboss.remoting.util.ConcurrentReferenceHashMap.ReferenceType.WEAK;
/**
* A set of helpful utility functions for collections.
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ConcurrentIntegerMap.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ConcurrentIntegerMap.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ConcurrentIntegerMap.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Set;
import java.util.Collection;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ConcurrentReferenceHashMap.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ConcurrentReferenceHashMap.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ConcurrentReferenceHashMap.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -4,7 +4,7 @@
* http://creativecommons.org/licenses/publicdomain
*/
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.io.IOException;
import java.io.Serializable;
import java.lang.ref.Reference;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/DelegateIterable.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/DelegateIterable.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/DelegateIterable.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Iterator;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/EmulatedConcurrentIntegerHashMap.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/EmulatedConcurrentIntegerHashMap.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/EmulatedConcurrentIntegerHashMap.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Set;
import java.util.Collection;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/NamingThreadFactory.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/NamingThreadFactory.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/NamingThreadFactory.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.concurrent.ThreadFactory;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/OrderedExecutor.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/OrderedExecutor.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/OrderedExecutor.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.concurrent.Executor;
import java.util.LinkedList;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/OrderedExecutorFactory.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/OrderedExecutorFactory.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/OrderedExecutorFactory.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.concurrent.Executor;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ServiceURI.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/ServiceURI.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/ServiceURI.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.net.URI;
import java.net.URISyntaxException;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/State.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/State.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/State.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
/**
*
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/StateLock.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/StateLock.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/StateLock.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
/**
* Lock rules:
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedCollection.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedCollection.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedCollection.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Collection;
import java.util.Iterator;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedIterator.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedIterator.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedIterator.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Iterator;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedMap.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedMap.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedMap.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Collection;
import java.util.Map;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedQueue.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedQueue.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedQueue.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Collection;
import java.util.Iterator;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedSet.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/SynchronizedSet.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/SynchronizedSet.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Set;
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Translator.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/Translator.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/Translator.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
/**
*
Modified: remoting3/trunk/util/src/main/java/org/jboss/remoting/util/WeakHashSet.java
===================================================================
--- remoting3/trunk/util/src/main/java/org/jboss/cx/remoting/util/WeakHashSet.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/util/src/main/java/org/jboss/remoting/util/WeakHashSet.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.util;
+package org.jboss.remoting.util;
import java.util.Collection;
import java.util.Iterator;
Copied: remoting3/trunk/version/src/main/java/org/jboss/remoting (from rev 4566, remoting3/trunk/version/src/main/java/org/jboss/cx/remoting)
Copied: remoting3/trunk/version/src/main/java/org/jboss/remoting/version (from rev 4572, remoting3/trunk/version/src/main/java/org/jboss/cx/remoting/version)
Modified: remoting3/trunk/version/src/main/java/org/jboss/remoting/version/Version.java
===================================================================
--- remoting3/trunk/version/src/main/java/org/jboss/cx/remoting/version/Version.java 2008-09-18 02:27:13 UTC (rev 4572)
+++ remoting3/trunk/version/src/main/java/org/jboss/remoting/version/Version.java 2008-09-18 03:06:39 UTC (rev 4573)
@@ -1,4 +1,4 @@
-package org.jboss.cx.remoting.version;
+package org.jboss.remoting.version;
/**
* The version of Remoting.
More information about the jboss-remoting-commits
mailing list