You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/11/13 08:58:55 UTC
[aries-rsa] branch ARIES-1942 updated (e1bc7d4 -> fd72e6a)
This is an automated email from the ASF dual-hosted git repository.
cschneider pushed a change to branch ARIES-1942
in repository https://gitbox.apache.org/repos/asf/aries-rsa.git.
from e1bc7d4 ARIES-1942 - Use custom annotations for discovery and distribution
add 54c6972 Simplify MultiMap
add 10348ce Made MultiMap key a generic type
add 17a3898 Remove redundant semicolon
add 85f26da Fix TopologyManagerImport concurrency
add 8035bca Standardize license headers
add fd72e6a Merge branch 'master' into ARIES-1942
No new revisions were added by this update.
Summary of changes:
.../aries/rsa/discovery/config/Activator.java | 1 -
.../rsa/discovery/config/ConfigDiscovery.java | 1 -
.../rsa/discovery/config/PropertyValidator.java | 1 -
.../discovery/config/PropertyValidatorTest.java | 3 +-
.../endpoint/EndpointDescriptionParserImpl.java | 2 +-
.../rsa/discovery/endpoint/PropertiesMapper.java | 2 +-
.../local/EndpointDescriptionBundleParser.java | 2 +-
.../aries/rsa/discovery/local/LocalDiscovery.java | 2 +-
.../endpoint/EndpointDescriptionParserTest.java | 2 +-
.../discovery/endpoint/PropertiesMapperTest.java | 2 +-
.../local/EndpointDescriptionBundleParserTest.java | 2 +-
.../rsa/discovery/local/LocalDiscoveryTest.java | 2 +-
.../aries/rsa/discovery/zookeeper/Interest.java | 4 +-
.../rsa/discovery/zookeeper/InterestManager.java | 2 +-
.../zookeeper/PublishingEndpointListener.java | 2 +-
.../discovery/zookeeper/client/ClientManager.java | 2 +-
.../client/ZookeeperEndpointListener.java | 2 +-
.../client/ZookeeperEndpointRepository.java | 2 +-
.../rsa/discovery/zookeeper/package-info.java | 2 +-
.../zookeeper/server/MyQuorumPeerMain.java | 4 +-
.../zookeeper/server/MyZooKeeperServerMain.java | 4 +-
.../zookeeper/server/ZookeeperServer.java | 4 +-
.../zookeeper/server/ZookeeperStarter.java | 2 +-
.../discovery/zookeeper/InterestManagerTest.java | 2 +-
.../zookeeper/PublishingEndpointListenerTest.java | 2 +-
.../zookeeper/ZookeeperDiscoveryTest.java | 2 +-
.../zookeeper/client/ClientManagerTest.java | 2 +-
.../ZookeeperEndpointRepositoryPathTest.java | 2 +-
.../zookeeper/server/ZookeeperStarterTest.java | 2 +-
.../java/org/apache/aries/rsa/eapub/Activator.java | 2 +-
.../apache/aries/rsa/eapub/EventAdminHelper.java | 2 +-
.../aries/rsa/eapub/EventAdminHelperTest.java | 2 +-
.../rsa/examples/fastbin/api/EchoService.java | 2 +-
.../examples/fastbin/consumer/EchoConsumer.java | 2 +-
.../examples/fastbin/service/EchoServiceImpl.java | 2 +-
.../rsa/examples/echotcp/api/EchoService.java | 2 +-
.../examples/echotcp/consumer/EchoConsumer.java | 2 +-
.../examples/echotcp/service/EchoServiceImpl.java | 2 +-
.../apache/aries/rsa/itests/felix/RsaTestBase.java | 3 +-
.../rsa/itests/felix/ServerConfiguration.java | 3 +-
.../rsa/itests/felix/TwoContainerPaxExam.java | 3 +-
.../config/TestConfigDiscoveryRoundTrip.java | 5 +-
.../itests/felix/fastbin/TestFastbinRoundTrip.java | 4 +-
.../rsa/itests/felix/rsa/TestRSAListener.java | 5 +-
.../rsa/itests/felix/tcp/TestDiscoveryExport.java | 2 +-
.../rsa/itests/felix/tcp/TestDiscoveryImport.java | 4 +-
.../aries/rsa/itests/felix/tcp/TestFindHook.java | 5 +-
.../aries/rsa/itests/felix/tcp/TestRoundTrip.java | 5 +-
.../aries/rsa/provider/fastbin/Activator.java | 2 +-
.../aries/rsa/provider/fastbin/BaseActivator.java | 2 +-
.../rsa/provider/fastbin/FastBinProvider.java | 2 +-
.../rsa/provider/fastbin/api/AsyncCallback.java | 2 +-
.../provider/fastbin/api/AsyncCallbackFuture.java | 2 +-
.../aries/rsa/provider/fastbin/api/Dispatched.java | 2 +-
.../fastbin/api/ObjectSerializationStrategy.java | 2 +-
.../fastbin/api/ProtobufSerializationStrategy.java | 2 +-
.../rsa/provider/fastbin/api/Serialization.java | 2 +-
.../fastbin/api/SerializationStrategy.java | 2 +-
.../rsa/provider/fastbin/io/ClientInvoker.java | 2 +-
.../rsa/provider/fastbin/io/ProtocolCodec.java | 2 +-
.../rsa/provider/fastbin/io/ServerInvoker.java | 2 +-
.../aries/rsa/provider/fastbin/io/Service.java | 2 +-
.../aries/rsa/provider/fastbin/io/Transport.java | 2 +-
.../fastbin/io/TransportAcceptListener.java | 3 +-
.../rsa/provider/fastbin/io/TransportListener.java | 2 +-
.../rsa/provider/fastbin/io/TransportServer.java | 2 +-
.../aries/rsa/provider/fastbin/streams/Chunk.java | 2 +-
.../provider/fastbin/streams/InputStreamProxy.java | 2 +-
.../fastbin/streams/OutputStreamProxy.java | 2 +-
.../provider/fastbin/streams/StreamProvider.java | 2 +-
.../fastbin/streams/StreamProviderImpl.java | 2 +-
.../fastbin/tcp/AbstractInvocationStrategy.java | 2 +-
.../fastbin/tcp/AsyncFutureInvocationStrategy.java | 2 +-
.../fastbin/tcp/AsyncInvocationStrategy.java | 2 +-
.../tcp/AsyncPromiseInvocationStrategy.java | 2 +-
.../fastbin/tcp/BlockingInvocationStrategy.java | 2 +-
.../provider/fastbin/tcp/ClientInvokerImpl.java | 2 +-
.../provider/fastbin/tcp/InvocationStrategy.java | 2 +-
.../rsa/provider/fastbin/tcp/InvocationType.java | 2 +-
.../provider/fastbin/tcp/LengthPrefixedCodec.java | 2 +-
.../rsa/provider/fastbin/tcp/ResponseFuture.java | 2 +-
.../provider/fastbin/tcp/ServerInvokerImpl.java | 2 +-
.../rsa/provider/fastbin/tcp/TcpTransport.java | 2 +-
.../provider/fastbin/tcp/TcpTransportFactory.java | 2 +-
.../provider/fastbin/tcp/TcpTransportServer.java | 2 +-
.../rsa/provider/fastbin/tcp/TransportPool.java | 2 +-
.../fastbin/util/ClassLoaderObjectInputStream.java | 2 +-
.../fastbin/util/IntrospectionSupport.java | 2 +-
.../rsa/provider/fastbin/util/StringSupport.java | 2 +-
.../rsa/provider/fastbin/util/URISupport.java | 2 +-
.../rsa/provider/fastbin/util/UuidGenerator.java | 2 +-
.../rsa/provider/fastbin/FutureInvocationTest.java | 2 +-
.../aries/rsa/provider/fastbin/InvocationTest.java | 2 +-
.../aries/rsa/provider/fastbin/ManagerTest.java | 2 +-
.../provider/fastbin/PromiseInvocationTest.java | 3 +-
.../rsa/provider/fastbin/StreamInvocationTest.java | 3 +-
.../rsa/provider/fastbin/TransportFailureTest.java | 2 +-
.../fastbin/streams/InputStreamProxyTest.java | 2 +-
.../fastbin/streams/OutputStreamProxyTest.java | 2 +-
.../fastbin/tcp/LengthPrefixedCodecTest.java | 2 +-
.../apache/aries/rsa/provider/tcp}/Activator.java | 33 +++++------
.../rsa/provider/tcp/EndpointPropertiesParser.java | 2 +-
.../aries/rsa/provider/tcp/LocalHostUtil.java | 2 +-
.../aries/rsa/provider/tcp/MethodInvoker.java | 2 +-
.../apache/aries/rsa/provider/tcp/TCPProvider.java | 2 +-
.../apache/aries/rsa/provider/tcp/TCPServer.java | 2 +-
.../apache/aries/rsa/provider/tcp/TcpEndpoint.java | 2 +-
.../rsa/provider/tcp/TcpInvocationHandler.java | 2 +-
.../provider/tcp/ser/BasicObjectInputStream.java | 2 +-
.../provider/tcp/ser/BasicObjectOutputStream.java | 2 +-
.../aries/rsa/provider/tcp/ser/DTOMarker.java | 2 +-
.../apache/aries/rsa/provider/tcp/ser/DTOUtil.java | 4 +-
.../aries/rsa/provider/tcp/ser/VersionMarker.java | 2 +-
.../aries/rsa/provider/tcp/ActivatorTest.java | 50 ++++++++++++++++
.../aries/rsa/provider/tcp/EndpointParserTest.java | 2 +-
.../aries/rsa/provider/tcp/TcpEndpointTest.java | 2 +-
.../rsa/provider/tcp/TcpProviderIntentTest.java | 2 +-
.../rsa/provider/tcp/TcpProviderPrimitiveTest.java | 2 +-
.../aries/rsa/provider/tcp/TcpProviderTest.java | 2 +-
.../aries/rsa/provider/tcp/myservice/DTOType.java | 2 +-
.../tcp/myservice/ExpectedTestException.java | 2 +-
.../rsa/provider/tcp/myservice/MyService.java | 2 +-
.../rsa/provider/tcp/myservice/MyServiceImpl.java | 2 +-
.../provider/tcp/myservice/PrimitiveService.java | 2 +-
.../tcp/myservice/PrimitiveServiceImpl.java | 2 +-
.../java/org/apache/aries/rsa/core/Activator.java | 2 +-
.../aries/rsa/core/ClientServiceFactory.java | 2 +-
.../org/apache/aries/rsa/core/CloseHandler.java | 2 +-
.../rsa/core/DistributionProviderTracker.java | 2 +-
.../apache/aries/rsa/core/ExportReferenceImpl.java | 2 +-
.../aries/rsa/core/ExportRegistrationImpl.java | 2 +-
.../aries/rsa/core/ImportRegistrationImpl.java | 2 +-
.../org/apache/aries/rsa/core/PackageUtil.java | 2 +-
.../aries/rsa/core/RemoteServiceAdminCore.java | 2 +-
.../aries/rsa/core/RemoteServiceAdminFactory.java | 2 +-
.../aries/rsa/core/RemoteServiceAdminInstance.java | 2 +-
.../aries/rsa/core/event/EventAdminSender.java | 2 +-
.../apache/aries/rsa/core/event/EventProducer.java | 2 +-
.../aries/rsa/core/ClientServiceFactoryTest.java | 2 +-
.../rsa/core/DistributionProviderTrackerTest.java | 2 +-
.../aries/rsa/core/ImportRegistrationImplTest.java | 2 +-
.../aries/rsa/core/OverlayPropertiesTest.java | 2 +-
.../aries/rsa/core/RemoteServiceAdminCoreTest.java | 2 +-
.../aries/rsa/core/event/EventProducerTest.java | 2 +-
.../apache/aries/rsa/spi/DistributionProvider.java | 2 +-
.../java/org/apache/aries/rsa/spi/Endpoint.java | 2 +-
.../aries/rsa/spi/EndpointDescriptionParser.java | 2 +-
.../org/apache/aries/rsa/spi/ExportPolicy.java | 2 +-
.../aries/rsa/spi/IntentUnsatisfiedException.java | 2 +-
.../org/apache/aries/rsa/util/EndpointHelper.java | 2 +-
.../java/org/apache/aries/rsa/util/StringPlus.java | 2 +-
.../org/apache/aries/rsa/util/StringPlusTest.java | 2 +-
.../aries/rsa/topologymanager/Activator.java | 2 +-
.../EndpointEventListenerTracker.java | 4 +-
.../exporter/DefaultExportPolicy.java | 2 +-
.../exporter/EndpointListenerAdapter.java | 4 +-
.../exporter/EndpointListenerNotifier.java | 2 +-
.../exporter/ServiceExportsRepository.java | 2 +-
.../exporter/TopologyManagerExport.java | 2 +-
.../rsa/topologymanager/importer/MultiMap.java | 68 ++++++++++------------
.../importer/TopologyManagerImport.java | 18 +++---
.../importer/local/EndpointListenerManager.java | 2 +-
.../importer/local/FilterHelper.java | 2 +-
.../importer/local/ListenerHookImpl.java | 2 +-
.../topologymanager/importer/local/RSFindHook.java | 2 +-
.../importer/local/ReferenceCounter.java | 2 +-
.../importer/local/ServiceInterestListener.java | 4 +-
.../aries/rsa/topologymanager/ActivatorTest.java | 2 +-
.../exporter/EndpointListenerNotifierTest.java | 2 +-
.../exporter/RecordingEndpointEventListener.java | 4 +-
.../exporter/TopologyManagerExportTest.java | 2 +-
.../importer/TopologyManagerImportTest.java | 2 +-
.../importer/local/EndpointListenerImplTest.java | 2 +-
.../importer/local/FilterHelperTest.java | 2 +-
.../importer/local/ListenerHookImplTest.java | 2 +-
.../importer/local/ReferenceCounterTest.java | 2 +-
176 files changed, 291 insertions(+), 260 deletions(-)
copy {rsa/src/main/java/org/apache/aries/rsa/core => provider/tcp/src/main/java/org/apache/aries/rsa/provider/tcp}/Activator.java (57%)
create mode 100644 provider/tcp/src/test/java/org/apache/aries/rsa/provider/tcp/ActivatorTest.java