Index: TECH/PubSub/impl/SimpelEventRaiser.cls.xml
===================================================================
diff -u -r484 -r1051
--- TECH/PubSub/impl/SimpelEventRaiser.cls.xml	(.../SimpelEventRaiser.cls.xml)	(revision 484)
+++ TECH/PubSub/impl/SimpelEventRaiser.cls.xml	(.../SimpelEventRaiser.cls.xml)	(revision 1051)
@@ -3,7 +3,7 @@
 <Class name="TECH.PubSub.impl.SimpelEventRaiser">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.PubSub.EventRaiser</Super>
+<Super>TECH.RegisteredObject,TECH.PubSub.EventRaiser</Super>
 
 <Method name="RaiseEventAsync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
@@ -27,7 +27,7 @@
 		Do ##class(vhLib.Logger).%New("PubSub").Debug("RaiseEventAsync","object :"_$$ObjToText^vhLib(Event.Data)_$C(13,10)_"StackToString : "_$E($$GetStackToString^vhLib(),1,30000))
 	}
 	Catch {
-		// Do nothing
+		#dim Exception = ##class(TECH.ExceptionHandler).Catch()
 	}
 ]]></Implementation>
 </Method>
Index: TECH/Context.cls.xml
===================================================================
diff -u -r933 -r1051
--- TECH/Context.cls.xml	(.../Context.cls.xml)	(revision 933)
+++ TECH/Context.cls.xml	(.../Context.cls.xml)	(revision 1051)
@@ -47,6 +47,11 @@
 <Default>QueryAPI</Default>
 </Parameter>
 
+<Parameter name="PubSubAPI">
+<Type>%String</Type>
+<Default>PubSubAPI</Default>
+</Parameter>
+
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Context</ReturnType>
@@ -85,6 +90,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefPubSubAPI">
+<ReturnType>TECH.PubSub.PubSubAPI</ReturnType>
+<Implementation><![CDATA[	Quit ..GeefAPIObject(..#PubSubAPI)
+]]></Implementation>
+</Method>
+
+<Method name="PushPubSubAPIClassName">
+<FormalSpec>Naam:%String</FormalSpec>
+<Implementation><![CDATA[	Do ..PushAPINaam(..#PubSubAPI,Naam)
+]]></Implementation>
+</Method>
+
+<Method name="PopPubSubAPIClassName">
+<Implementation><![CDATA[	Do ..PopAPINaam(..#PubSubAPI)
+]]></Implementation>
+</Method>
+
 <Method name="GeefMailAPI">
 <ReturnType>TECH.Mail.MailAPI</ReturnType>
 <Implementation><![CDATA[	Quit ..GeefAPIObject(..#MailAPI)
@@ -187,6 +209,7 @@
 	Do ..PushHttpAPIClassName(##class(TECH.Http.impl.HttpAPI).%ClassName(1))
 	Do ..PushFileAPIClassName(##class(TECH.File.impl.FileAPI).%ClassName(1))
 	Do ..PushQueryAPIClassName(##class(TECH.Query.impl.QueryAPI).%ClassName(1))
+	Do ..PushPubSubAPIClassName(##class(TECH.PubSub.impl.PubSubAPI).%ClassName(1))
 ]]></Implementation>
 </Method>
 
Index: TECH/PubSub/EventRaiser.cls.xml
===================================================================
diff -u -r95 -r1051
--- TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 95)
+++ TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 1051)
@@ -4,7 +4,7 @@
 <Abstract>1</Abstract>
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>%RegisteredObject</Super>
+<Super>TECH.Interface</Super>
 
 <Method name="RaiseEventAsync">
 <Abstract>1</Abstract>
Index: TECH/PubSub/impl/PubSubAPI.cls.xml
===================================================================
diff -u
--- TECH/PubSub/impl/PubSubAPI.cls.xml	(revision 0)
+++ TECH/PubSub/impl/PubSubAPI.cls.xml	(revision 1051)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.impl.PubSubAPI">
+<Super>TECH.RegisteredObject,TECH.PubSub.PubSubAPI</Super>
+
+<Method name="GeefEventRaiser">
+<ReturnType>TECH.PubSub.EventRaiser</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.PubSub.impl.SimpelEventRaiser).%New()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: TECH/PubSub/WachtendeEventVerwerker.cls.xml
===================================================================
diff -u -r655 -r1051
--- TECH/PubSub/WachtendeEventVerwerker.cls.xml	(.../WachtendeEventVerwerker.cls.xml)	(revision 655)
+++ TECH/PubSub/WachtendeEventVerwerker.cls.xml	(.../WachtendeEventVerwerker.cls.xml)	(revision 1051)
@@ -60,7 +60,7 @@
 		
 		If (RaiseEvent)
 		{
-			Do ##class(TECH.PubSub.OrchestrationContext).GetEventRaiser().RaiseEventAsync(WachtendEvent.Event)
+			Do ##class(TECH.Context).Instance().GeefPubSubAPI().GeefEventRaiser().RaiseEventAsync(WachtendEvent.Event)
 		}
 		#dim Status As %Status = WachtendEvent.%DeleteId(WachtendEvent.%Id())
 		If ($$$ISERR(Status)) $$$ThrowStatus(Status)
FishEye: Tag 1051 refers to a dead (removed) revision in file `TECH/PubSub/OrchestrationContext.cls.xml'.
FishEye: No comparison available.  Pass `N' to diff?
Index: TECH/PubSub/PubSubAPI.cls.xml
===================================================================
diff -u
--- TECH/PubSub/PubSubAPI.cls.xml	(revision 0)
+++ TECH/PubSub/PubSubAPI.cls.xml	(revision 1051)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.PubSubAPI">
+<Abstract>1</Abstract>
+<Super>TECH.Interface</Super>
+
+<Method name="GeefEventRaiser">
+<Abstract>1</Abstract>
+<ReturnType>TECH.PubSub.EventRaiser</ReturnType>
+</Method>
+</Class>
+
+
+<Package name="TECH.PubSub" sqlname="TECH_PubSub"/>
+</Export>
Index: TECH/PubSub/EventList.cls.xml
===================================================================
diff -u
--- TECH/PubSub/EventList.cls.xml	(revision 0)
+++ TECH/PubSub/EventList.cls.xml	(revision 1051)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.PubSub.EventList">
+<Super>%ListOfObjects</Super>
+
+<Parameter name="ELEMENTTYPE">
+<Description>
+The type (class name) of the elements stored in the collection.</Description>
+<Default>TECH.PubSub.Event</Default>
+</Parameter>
+
+<Storage name="Custom">
+<Type>%Library.CompleteCustomStorage</Type>
+</Storage>
+</Class>
+
+
+<Package name="TECH.PubSub" sqlname="TECH_PubSub"/>
+</Export>