@@ -22,7 +22,7 @@ namespace IServiceOriented.ServiceBus.Samples.Chat MessageDeliveryFormatter formatter = new MessageDeliveryFormatter(new ConverterMessageDeliveryReaderFactory(encoder, typeof(IChatService)), new ConverterMessageDeliveryWriterFactory(encoder, typeof(IChatService))); _serviceBus = new ServiceBusRuntime(new DirectDeliveryCore() , new WcfManagementService()); - _serviceBus.Listen(new ListenerEndpoint(Guid.NewGuid(), "Chat Service", "ChatServer", "http://localhost/chatServer", typeof(IChatService), new WcfServiceHostListener())); + _serviceBus.AddListener(new ListenerEndpoint(Guid.NewGuid(), "Chat Service", "ChatServer", "http://localhost/chatServer", typeof(IChatService), new WcfServiceHostListener())); _serviceBus.Subscribe(new SubscriptionEndpoint(Guid.NewGuid(), "No subscribers", "ChatClient", "", typeof(IChatService), new MethodDispatcher(new UnhandledReplyHandler(_serviceBus)), new UnhandledMessageFilter(typeof(SendMessageRequest)), true)); _serviceBus.UnhandledException+= (o, ex) => { IServiceOriented.ServiceBus.Samples.Chat/ChatServer.cs @@ -46,7 +46,7 @@ namespace IServiceOriented.ServiceBus.UnitTests ServiceBusRuntime listenerRuntime = new ServiceBusRuntime(new DirectDeliveryCore()); var listener = new ListenerEndpoint(Guid.NewGuid(), "File System Listener", null, null, typeof(IContract), new FileSystemListener(new ConverterMessageDeliveryReaderFactory(encoder, typeof(IContract)), Config.IncomingFilePath, Config.ProcessedFilePath)); - listenerRuntime.Listen(listener); + listenerRuntime.AddListener(listener); listenerRuntime.Subscribe(new SubscriptionEndpoint(Guid.NewGuid(), "Pass through", null, null, typeof(IContract), new ActionDispatcher((se, md) => { }), new PassThroughMessageFilter())); var dispatchTester = new ServiceBusTest(dispatchRuntime); @@ -63,7 +63,7 @@ namespace IServiceOriented.ServiceBus.UnitTests }); }); - dispatchRuntime.Unsubscribe(subscription); + dispatchRuntime.RemoveSubscription(subscription); } [Test] @@ -79,7 +79,7 @@ namespace IServiceOriented.ServiceBus.UnitTests ServiceBusRuntime listenerRuntime = new ServiceBusRuntime(new DirectDeliveryCore()); var listener = new ListenerEndpoint(Guid.NewGuid(), "File System Listener", null, null, typeof(IContract), new FileSystemListener(new ConverterMessageDeliveryReaderFactory(encoder, typeof(IContract)),Config.IncomingFilePath, Config.ProcessedFilePath)); - listenerRuntime.Listen(listener); + listenerRuntime.AddListener(listener); listenerRuntime.Subscribe(new SubscriptionEndpoint(Guid.NewGuid(), "Pass through", null, null, typeof(IContract), new ActionDispatcher((se, md) => { }), new PassThroughMessageFilter())); var dispatchTester = new ServiceBusTest(dispatchRuntime); @@ -97,7 +97,7 @@ namespace IServiceOriented.ServiceBus.UnitTests }); }); - dispatchRuntime.Unsubscribe(subscription); + dispatchRuntime.RemoveSubscription(subscription); } } } IServiceOriented.ServiceBus.UnitTests/TestFileSystemDispatchersAndListeners.cs @@ -89,7 +89,7 @@ namespace IServiceOriented.ServiceBus.UnitTests throw new InvalidOperationException("Waited too long"); } - runtime.Unsubscribe(handled); + runtime.RemoveSubscription(handled); handledCount = 0; unhandledCount = 0; IServiceOriented.ServiceBus.UnitTests/TestMessageFilters.cs @@ -43,12 +43,12 @@ namespace IServiceOriented.ServiceBus.UnitTests Service.Use<IServiceBusManagementService>(managementService => { ListenerEndpoint endpoint = new ListenerEndpoint(Guid.NewGuid(), "name of endpoint", "NamedPipeListener", "net.pipe://test/someservice/", typeof(IContract), new WcfServiceHostListener()); - managementService.Listen(endpoint); + managementService.AddListener(endpoint); ListenerEndpoint added = managementService.ListListeners().First(); tester.AssertEqual(endpoint, added); - managementService.StopListening(endpoint.Id); + managementService.RemoveListener(endpoint.Id); Assert.IsEmpty(managementService.ListListeners()); }); }); IServiceOriented.ServiceBus.UnitTests/TestServiceBusManagement.cs @@ -63,7 +63,7 @@ namespace IServiceOriented.ServiceBus.UnitTests public void AddTestListener() { - serviceBusRuntime.Listen(new ListenerEndpoint(Guid.NewGuid(), "test", "NamedPipeListener", "net.pipe://localhost/servicebus/testlistener", typeof(IContract), new WcfServiceHostListener())); + serviceBusRuntime.AddListener(new ListenerEndpoint(Guid.NewGuid(), "test", "NamedPipeListener", "net.pipe://localhost/servicebus/testlistener", typeof(IContract), new WcfServiceHostListener())); } public void AddTestSubscription(ContractImplementation ci, MessageFilter messageFilter) IServiceOriented.ServiceBus.UnitTests/TestServiceBusRuntime.cs @@ -17,7 +17,7 @@ namespace IServiceOriented.ServiceBus.UnitTests public void WcfListener_Publishes_Incoming_Messages_Properly() { ServiceBusRuntime runtime = new ServiceBusRuntime(new DirectDeliveryCore()); - runtime.Listen(new ListenerEndpoint("test", "NamedPipeListener", "net.pipe://localhost/remotehello", typeof(IContract), new WcfServiceHostListener())); + runtime.AddListener(new ListenerEndpoint("test", "NamedPipeListener", "net.pipe://localhost/remotehello", typeof(IContract), new WcfServiceHostListener())); string message = "This is a test"; @@ -37,7 +37,7 @@ namespace IServiceOriented.ServiceBus.UnitTests public void WcfListener_Can_Listen_For_Raw_Messages() { ServiceBusRuntime runtime = new ServiceBusRuntime(new DirectDeliveryCore()); - runtime.Listen(new ListenerEndpoint("test", "PassThroughListener", "net.pipe://localhost/passthrough", typeof(IPassThroughServiceContract), new WcfServiceHostListener())); + runtime.AddListener(new ListenerEndpoint("test", "PassThroughListener", "net.pipe://localhost/passthrough", typeof(IPassThroughServiceContract), new WcfServiceHostListener())); string action = "http://someaction"; string body = "some body"; IServiceOriented.ServiceBus.UnitTests/TestWcfListener.cs @@ -208,8 +208,8 @@ namespace IServiceOriented.ServiceBus public event EventHandler Started; public event EventHandler Stopped; - public event EventHandler<EndpointEventArgs> Subscribed; - public event EventHandler<EndpointEventArgs> Unsubscribed; + public event EventHandler<EndpointEventArgs> SubscriptionAdded; + public event EventHandler<EndpointEventArgs> SubscriptionRemoved; public event EventHandler<EndpointEventArgs> ListenerAdded; public event EventHandler<EndpointEventArgs> ListenerRemoved; @@ -230,7 +230,7 @@ namespace IServiceOriented.ServiceBus ReaderWriterLockedObject<IEnumerable<SubscriptionEndpoint>, SubscriptionEndpointCollection> _subscriptions = new ReaderWriterLockedObject<IEnumerable<SubscriptionEndpoint>, SubscriptionEndpointCollection>(new SubscriptionEndpointCollection(), l => l); - public void Listen(ListenerEndpoint endpoint) + public void AddListener(ListenerEndpoint endpoint) { if (_disposed) throw new ObjectDisposedException("ServiceBusRuntime"); @@ -283,7 +283,7 @@ namespace IServiceOriented.ServiceBus } } - public void StopListening(Guid endpointId) + public void RemoveListener(Guid endpointId) { if (_disposed) throw new ObjectDisposedException("ServiceBusRuntime"); @@ -296,7 +296,7 @@ namespace IServiceOriented.ServiceBus { endpoint.Listener.StopInternal(); } - StopListening(endpoint); + RemoveListener(endpoint); foreach (RuntimeService service in ServiceLocator.GetAllInstances<RuntimeService>()) { @@ -316,7 +316,7 @@ namespace IServiceOriented.ServiceBus } } - public void StopListening(ListenerEndpoint endpoint) + public void RemoveListener(ListenerEndpoint endpoint) { if (_disposed) throw new ObjectDisposedException("ServiceBusRuntime"); @@ -515,7 +515,7 @@ namespace IServiceOriented.ServiceBus service.OnSubscriptionAdded(subscription); } - EventHandler<EndpointEventArgs> subscribedEvent = Subscribed; + EventHandler<EndpointEventArgs> subscribedEvent = SubscriptionAdded; if (subscribedEvent != null) subscribedEvent(this, new EndpointEventArgs(subscription)); ts.Complete(); @@ -535,7 +535,7 @@ namespace IServiceOriented.ServiceBus } } - public void Unsubscribe(Guid subscriptionId) + public void RemoveSubscription(Guid subscriptionId) { if (_disposed) throw new ObjectDisposedException("ServiceBusRuntime"); @@ -551,10 +551,10 @@ namespace IServiceOriented.ServiceBus throw new SubscriptionNotFoundException(); } - Unsubscribe(endpoint); + RemoveSubscription(endpoint); } - public void Unsubscribe(SubscriptionEndpoint subscription) + public void RemoveSubscription(SubscriptionEndpoint subscription) { if (_disposed) throw new ObjectDisposedException("ServiceBusRuntime"); @@ -580,7 +580,7 @@ namespace IServiceOriented.ServiceBus service.OnSubscriptionRemoved(subscription); } - EventHandler<EndpointEventArgs> unsubscribedEvent = Unsubscribed; + EventHandler<EndpointEventArgs> unsubscribedEvent = SubscriptionRemoved; if (unsubscribedEvent != null) unsubscribedEvent(this, new EndpointEventArgs(subscription)); ts.Complete(); IServiceOriented.ServiceBus/ServiceBusRuntime.cs @@ -220,7 +220,7 @@ namespace IServiceOriented.ServiceBus.Services } finally { - runtime.Unsubscribe(subscription); + runtime.RemoveSubscription(subscription); } } } IServiceOriented.ServiceBus/Services/HeartbeatRuntimeService.cs @@ -45,11 +45,11 @@ namespace IServiceOriented.ServiceBus.Services if (le != null) { - Runtime.StopListening(le); + Runtime.RemoveListener(le); } else if (se != null) { - Runtime.Unsubscribe(se); + Runtime.RemoveSubscription(se); } else { IServiceOriented.ServiceBus/Services/SubscriptionPersistenceService.cs @@ -17,8 +17,8 @@ namespace IServiceOriented.ServiceBus.Services { public const string Subscribe = "urn:SubscribeRequest"; public const string Unsubscribe = "urn:UnsubscribeRequest"; - public const string Listen = "urn:ListenRequest"; - public const string StopListening = "urn:StopListeningRequest"; + public const string AddListener = "urn:AddListener"; + public const string RemoveListener = "urn:RemoveListener"; public const string ListListeners = "urn:ListListeners"; public const string ListListenersResponse = "urn:ListListenersResponse"; @@ -65,12 +65,12 @@ namespace IServiceOriented.ServiceBus.Services [FaultContract(typeof(SubscriptionNotFoundFault))] void Unsubscribe([MessageParameter(Name = "SubscriptionID")] Guid subscriptionId); - [OperationContract(Action = WcfManagementServiceActions.Listen)] - void Listen([MessageParameter(Name = "ListenerEndpoint")] ListenerEndpoint endpoint); + [OperationContract(Action = WcfManagementServiceActions.AddListener)] + void AddListener([MessageParameter(Name = "ListenerEndpoint")] ListenerEndpoint endpoint); - [OperationContract(Action= WcfManagementServiceActions.StopListening)] + [OperationContract(Action= WcfManagementServiceActions.RemoveListener)] [FaultContract(typeof(ListenerNotFoundFault))] - void StopListening([MessageParameter(Name = "ListenerID")] Guid listenerId); + void RemoveListener([MessageParameter(Name = "ListenerID")] Guid listenerId); [OperationContract(Action = WcfManagementServiceActions.ListListeners, ReplyAction = WcfManagementServiceActions.ListListenersResponse)] Collection<ListenerEndpoint> ListListeners(); @@ -102,7 +102,7 @@ namespace IServiceOriented.ServiceBus.Services { try { - Runtime.Unsubscribe(subscriptionId); + Runtime.RemoveSubscription(subscriptionId); } catch (SubscriptionNotFoundException) { @@ -111,17 +111,17 @@ namespace IServiceOriented.ServiceBus.Services } [OperationBehavior] - public void Listen([MessageParameter(Name = "Endpoint")] ListenerEndpoint endpoint) + public void AddListener([MessageParameter(Name = "Endpoint")] ListenerEndpoint endpoint) { - Runtime.Listen(endpoint); + Runtime.AddListener(endpoint); } [OperationBehavior] - public void StopListening(Guid listenerId) + public void RemoveListener(Guid listenerId) { try { - Runtime.StopListening(listenerId); + Runtime.RemoveListener(listenerId); } catch (ListenerNotFoundException) { IServiceOriented.ServiceBus/Services/WcfManagementService.cs 085f8adb24b1c06fe377e5ec214f420d161b9fa0 jezell jezell@gmail.com http://github.com/jezell/iserviceoriented/commit/674c80de0db2300d92c22ef92bba5296a59ded00 674c80de0db2300d92c22ef92bba5296a59ded00 2008-10-23T19:01:37-07:00 2008-10-23T19:01:37-07:00 Renaming a few methods 94ac0d481613bf0ae46b51f3b15f9961374addaa jezell jezell@gmail.com