ipaacalib/java/src/ipaaca/IUEventType.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+public enum IUEventType
+{
+    ADDED, COMMITTED, DELETED, RETRACTED, UPDATED, LINKSUPDATED, MESSAGE;
+}

ipaacalib/java/src/ipaaca/IUPublishedException.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+/**
+ * IUPublishedException exceptions occur when publishing (=putting it in an output buffer) an already published IU.
+ * @author hvanwelbergen
+ * 
+ */
+public class IUPublishedException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+    private final AbstractIU iu;
+
+    public AbstractIU getIU()
+    {
+        return iu;
+    }
+
+    public IUPublishedException(AbstractIU iu)
+    {
+        super("IU " + iu.getUid() + " is already present in the output buffer.");
+        this.iu = iu;
+    }
+
+}

ipaacalib/java/src/ipaaca/IUReadOnlyException.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+/**
+ * IUReadOnlyException's occur when writing to a read-only IU
+ * @author hvanwelbergen
+ * 
+ */
+public class IUReadOnlyException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+    private final AbstractIU iu;
+
+    public AbstractIU getIU()
+    {
+        return iu;
+    }
+
+    public IUReadOnlyException(AbstractIU iu)
+    {
+        super("Writing to IU " + iu.getUid() + " failed -- it is read-only.");
+        this.iu = iu;
+    }
+}

ipaacalib/java/src/ipaaca/IUResendFailedException.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+/**
+ * Error indicating that an IU is immutable because it has been committed to.
+ * @author hvanwelbergen
+ * 
+ */
+public class IUResendFailedException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+    private final AbstractIU iu;
+
+    public AbstractIU getIU()
+    {
+        return iu;
+    }
+
+    public IUResendFailedException(AbstractIU iu)
+    {
+        super("Resending IU " + iu.getUid() + " failed.");
+        this.iu = iu;
+    }
+}

ipaacalib/java/src/ipaaca/IURetractedException.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2015 Social Cognitive Systems Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+/**
+ * Error indicating that an IU is immutable because it has been retracted.
+ * 
+ */
+public class IURetractedException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+    private final AbstractIU iu;
+
+    public AbstractIU getIU()
+    {
+        return iu;
+    }
+
+    public IURetractedException(AbstractIU iu)
+    {
+        super("Writing to IU " + iu.getUid() + " failed -- it has been retracted.");
+        this.iu = iu;
+    }
+}

ipaacalib/java/src/ipaaca/IUStore.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * An IUStore maps an IUid to an IU
+ * @author hvanwelbergen
+ *
+ * @param <X> type of AbstractIU stored in the store
+ */
+public class IUStore<X extends AbstractIU> extends ConcurrentHashMap<String, X>
+{
+    private static final long serialVersionUID = 1L;
+}

ipaacalib/java/src/ipaaca/IUUpdateFailedException.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+/**
+ * Indicates that a remote update failed
+ * @author hvanwelbergen
+ * 
+ */
+public class IUUpdateFailedException extends RuntimeException
+{
+    private static final long serialVersionUID = 1L;
+    private final AbstractIU iu;
+
+    public AbstractIU getIU()
+    {
+        return iu;
+    }
+
+    public IUUpdateFailedException(AbstractIU iu)
+    {
+        super("Remote update failed for IU " + iu.getUid() + ".");
+        this.iu = iu;
+    }
+}

ipaacalib/java/src/ipaaca/Initializer.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2015 Social Cognitive Systems Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+import java.nio.ByteBuffer;
+import ipaaca.protobuf.Ipaaca.IUCommission;
+import ipaaca.protobuf.Ipaaca.IUResendRequest;
+import ipaaca.protobuf.Ipaaca.IURetraction;
+import rsb.converter.ConverterSignature;
+import rsb.converter.ConverterRepository;
+import rsb.converter.DefaultConverterRepository;
+import rsb.converter.ProtocolBufferConverter;
+
+/**
+ * Hooks up the ipaaca converters, call initializeIpaacaRsb() before using ipaaca.
+ * @author hvanwelbergen
+ * 
+ */
+public final class Initializer {
+
+    private Initializer() {}
+
+    private static volatile boolean initialized = false;
+    
+    public synchronized static void initializeIpaacaRsb() {
+        if (initialized)
+            return;
+
+        ConverterRepository<ByteBuffer> dcr =
+            DefaultConverterRepository.getDefaultConverterRepository();
+
+        // for IU revision numbers
+        dcr.addConverter(
+            new IntConverter());
+
+        // IU commit messages
+        dcr.addConverter(
+            new ProtocolBufferConverter<IUCommission>(
+                IUCommission.getDefaultInstance()));
+
+        // IU commit messages
+        dcr.addConverter(
+            new ProtocolBufferConverter<IURetraction>(
+                IURetraction.getDefaultInstance()));
+
+        // IU resend request messages
+        dcr.addConverter(
+            new ProtocolBufferConverter<IUResendRequest>(
+                IUResendRequest.getDefaultInstance()));
+
+        // IUs
+        dcr.addConverter(
+            new IUConverter(
+                new ConverterSignature(
+                    "ipaaca-iu",
+                    RemotePushIU.class)));
+
+        // Local IUs
+        dcr.addConverter(
+            new IUConverter(
+                new ConverterSignature(
+                    "ipaaca-localiu",
+                    LocalIU.class)));
+
+        // Messages
+        dcr.addConverter(
+            new IUConverter(
+                new ConverterSignature(
+                    "ipaaca-messageiu",
+                    RemoteMessageIU.class)));
+
+        // LocalMessages
+        dcr.addConverter(
+            new IUConverter(
+                new ConverterSignature(
+                    "ipaaca-localmessageiu",
+                    LocalMessageIU.class)));
+         
+        // Payloads
+        dcr.addConverter(
+            new PayloadConverter());
+
+        // LinkUpdates
+        dcr.addConverter(
+            new LinkUpdateConverter());
+
+        initialized = true;
+    }
+}

ipaacalib/java/src/ipaaca/InputBuffer.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+import ipaaca.protobuf.Ipaaca.IUCommission;
+import ipaaca.protobuf.Ipaaca.IURetraction;
+import ipaaca.protobuf.Ipaaca.IUResendRequest;
+import ipaaca.protobuf.Ipaaca.IULinkUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import rsb.Event;
+import rsb.Factory;
+import rsb.Handler;
+import rsb.InitializeException;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+import rsb.Listener;
+import rsb.RSBException;
+import rsb.Scope;
+import rsb.patterns.RemoteServer;
+
+/**
+ * An InputBuffer that holds remote IUs.
+ * @author hvanwelbergen
+ */
+@Slf4j
+public class InputBuffer extends Buffer
+{
+    private Map<String, RemoteServer> remoteServerStore = new HashMap<String, RemoteServer>();
+    private Map<String, Listener> listenerStore = new HashMap<String, Listener>();
+    private Set<String> categoryInterests = new HashSet<String>();
+    private final static Logger logger = LoggerFactory.getLogger(InputBuffer.class.getName());
+    private IUStore<RemotePushIU> iuStore = new IUStore<RemotePushIU>();
+    private IUStore<RemoteMessageIU> messageStore = new IUStore<RemoteMessageIU>();
+
+    private String channel = "default";
+    private boolean resendActive;
+
+    public void close()
+    {
+        for (Listener listener : listenerStore.values())
+        {
+            try
+            {
+                listener.deactivate();
+            }
+            catch (RSBException e)
+            {
+                log.warn("RSB Exception on deactive {}", e, listener.toString());
+            }
+            catch (InterruptedException e)
+            {
+                Thread.currentThread().interrupt();
+            }
+        }
+        for (RemoteServer remServer : remoteServerStore.values())
+        {
+            try
+            {
+                remServer.deactivate();
+            }
+            catch (RSBException e)
+            {
+                log.warn("RSB Exception on RemoteServer deactivate {}", e, remServer.toString());
+            }
+            catch (InterruptedException e)
+            {
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    // def __init__(self, owning_component_name, category_interests=None, participant_config=None):
+    // '''Create an InputBuffer.
+    //
+    // Keyword arguments:
+    // owning_compontent_name -- name of the entity that owns this InputBuffer
+    // category_interests -- list of IU categories this Buffer is interested in
+    // participant_config = RSB configuration
+    // '''
+    // super(InputBuffer, self).__init__(owning_component_name, participant_config)
+    // self._unique_name = '/ipaaca/component/'+str(owning_component_name)+'ID'+self._uuid+'/IB'
+    // self._listener_store = {} # one per IU category
+    // self._remote_server_store = {} # one per remote-IU-owning Component
+    // self._category_interests = []
+    // if category_interests is not None:
+    // for cat in category_interests:
+    // self._create_category_listener_if_needed(cat)
+    public InputBuffer(String owningComponentName, Set<String> categoryInterests)
+    {
+        this(owningComponentName, categoryInterests, "default");
+    }
+
+
+    public InputBuffer(String owningComponentName, Set<String> categoryInterests, String ipaaca_channel)
+    {
+        super(owningComponentName);
+        resendActive = false;
+        String shortIDName = getUniqueShortName();
+        uniqueName = "/ipaaca/component/" + shortIDName + "/IB";
+
+        this.channel = ipaaca_channel;
+        
+        for (String cat : categoryInterests)
+        {
+            createCategoryListenerIfNeeded(cat);
+        }
+
+    // add own uuid as identifier for hidden channel. (dlw)
+    createCategoryListenerIfNeeded(shortIDName);
+    }
+
+    /** Pass resendActive to toggle resendRequest-functionality. */
+    public InputBuffer(BufferConfiguration bufferconfiguration)
+    {
+        super(bufferconfiguration.getOwningComponentName());
+        this.resendActive = bufferconfiguration.getResendActive();
+        String shortIDName = getUniqueShortName();
+        uniqueName = "/ipaaca/component/" + shortIDName + "/IB";
+
+        for (String cat : bufferconfiguration.getCategoryInterests())
+        {
+            createCategoryListenerIfNeeded(cat);
+        }
+        this.channel = bufferconfiguration.getChannel();
+
+        // add own uuid as identifier for hidden channel. (dlw)
+        createCategoryListenerIfNeeded(shortIDName);
+    }
+
+    public boolean isResendActive() {
+        return this.resendActive;
+    }
+
+    public void setResendActive(boolean active) {
+        this.resendActive = active;
+    }
+
+    // def _get_remote_server(self, iu):
+    // '''Return (or create, store and return) a remote server.'''
+    // if iu.owner_name in self._remote_server_store:
+    // return self._remote_server_store[iu.owner_name]
+    // remote_server = rsb.createRemoteServer(rsb.Scope(str(iu.owner_name)))
+    // self._remote_server_store[iu.owner_name] = remote_server
+    // return remote_server
+    protected RemoteServer getRemoteServer(AbstractIU iu)
+    {
+        if (remoteServerStore.containsKey(iu.getOwnerName()))
+        {
+            return remoteServerStore.get(iu.getOwnerName());
+        }
+        logger.debug("Getting remote server for {}", iu.getOwnerName());
+        RemoteServer remoteServer = Factory.getInstance().createRemoteServer(new Scope(iu.getOwnerName()));
+        try
+        {
+            remoteServer.activate();
+        }
+        catch (InitializeException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (RSBException e)
+        {
+            throw new RuntimeException(e);
+        }
+        remoteServerStore.put(iu.getOwnerName(), remoteServer);
+        return remoteServer;
+    }
+
+    protected RemoteServer getRemoteServer(String ownerName)
+    {
+        if (remoteServerStore.containsKey(ownerName))
+        {
+            return remoteServerStore.get(ownerName);
+        }
+        logger.debug("Getting remote server for {}", ownerName);
+        RemoteServer remoteServer = Factory.getInstance().createRemoteServer(new Scope(ownerName));
+        try
+        {
+            remoteServer.activate();
+        }
+        catch (InitializeException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (RSBException e)
+        {
+            throw new RuntimeException(e);
+        }
+        remoteServerStore.put(ownerName, remoteServer);
+        return remoteServer;
+    }
+
+    // def _create_category_listener_if_needed(self, iu_category):
+    // '''Return (or create, store and return) a category listener.'''
+    // if iu_category in self._listener_store: return self._informer_store[iu_category]
+    // cat_listener = rsb.createListener(rsb.Scope("/ipaaca/category/"+str(iu_category)), config=self._participant_config)
+    // cat_listener.addHandler(self._handle_iu_events)
+    // self._listener_store[iu_category] = cat_listener
+    // self._category_interests.append(iu_category)
+    // logger.info("Added category listener for "+iu_category)
+    // return cat_listener
+    private Listener createCategoryListenerIfNeeded(String category)
+    {
+        if (listenerStore.containsKey(category))
+        {
+            return listenerStore.get(category);
+        }
+        Listener listener;
+        try
+        {
+            listener = Factory.getInstance().createListener(new Scope("/ipaaca/channel/" + this.channel + "/category/" + category));
+        }
+        catch (InitializeException e1)
+        {
+            throw new RuntimeException(e1);
+        }
+        listenerStore.put(category, listener);
+        categoryInterests.add(category);
+        try
+        {
+            listener.addHandler(new InputHandler(), true);
+        }
+        catch (InterruptedException e1)
+        {
+            Thread.currentThread().interrupt();
+        }
+        logger.info("Added category listener for {}", category);
+        try
+        {
+            listener.activate();
+        }
+        catch (InitializeException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (RSBException e)
+        {
+            throw new RuntimeException(e);
+        }
+        return listener;
+    }
+
+    class InputHandler implements Handler
+    {
+
+        @Override
+        public void internalNotify(Event ev)
+        {
+            handleIUEvents(ev);
+        }
+
+    }
+    
+    // def _handle_iu_events(self, event):
+    // '''Dispatch incoming IU events.
+    //
+    // Adds incoming IU's to the store, applies payload and commit updates to
+    // IU, calls IU event handlers.'
+    //
+    // Keyword arguments:
+    // event -- a converted RSB event
+    // '''
+    // if type(event.data) is RemotePushIU:
+    // # a new IU
+    // if event.data.uid in self._iu_store:
+    // # already in our store
+    // pass
+    // else:
+    // self._iu_store[ event.data.uid ] = event.data
+    // event.data.buffer = self
+    // self.call_iu_event_handlers(event.data.uid, local=False, event_type=IUEventType.ADDED, category=event.data.category)
+    // else:
+    // # an update to an existing IU
+    // if event.data.writer_name == self.unique_name:
+    // # Discard updates that originate from this buffer
+    // return
+    // if event.data.uid not in self._iu_store:
+    // # TODO: we should request the IU's owner to send us the IU
+    // logger.warning("Update message for IU which we did not fully receive before.")
+    // return
+    // if type(event.data) is iuProtoBuf_pb2.IUCommission:
+    // # IU commit
+    // iu = self._iu_store[event.data.uid]
+    // iu._apply_commission()
+    // iu._revision = event.data.revision
+    // self.call_iu_event_handlers(event.data.uid, local=False, event_type=IUEventType.COMMITTED, category=iu.category)
+    // elif type(event.data) is IUPayloadUpdate:
+    // # IU payload update
+    // iu = self._iu_store[event.data.uid]
+    // iu._apply_update(event.data)
+    // self.call_iu_event_handlers(event.data.uid, local=False, event_type=IUEventType.UPDATED, category=iu.category)
+    /**
+     * Dispatch incoming IU events.
+     */
+    private void handleIUEvents(Event event)
+    {
+        if (event.getData() instanceof RemoteMessageIU)
+        {
+            RemoteMessageIU rm = (RemoteMessageIU) event.getData();
+            if (messageStore.containsKey(rm.getUid())) {
+                logger.warn("Spurious RemoteMessage event: already got this UID: "+rm.getUid());
+                return;
+            }
+            //logger.info("Adding Message "+rm.getUid());
+            messageStore.put(rm.getUid(), rm);
+            //logger.info("Calling handlers for Message "+rm.getUid());
+            callIuEventHandlers(rm.getUid(),false, IUEventType.MESSAGE, rm.getCategory());
+            //logger.info("Removing Message "+rm.getUid());
+            messageStore.remove(rm.getUid());
+        }
+        else if (event.getData() instanceof RemotePushIU)
+        {
+            RemotePushIU rp = (RemotePushIU) event.getData();
+            // a new IU
+            if (iuStore.containsKey(rp.getUid()))
+            {
+                // already in our store
+                return;
+            }
+            else
+            {
+                iuStore.put(rp.getUid(), rp);
+                rp.setBuffer(this);
+                this.callIuEventHandlers(rp.getUid(), false, IUEventType.ADDED, rp.getCategory());
+            }
+        }
+        else
+        {
+            if (event.getData() instanceof IULinkUpdate)
+            {
+                IULinkUpdate iuLinkUpdate = (IULinkUpdate) event.getData();
+                if (iuLinkUpdate.getWriterName().equals(this.getUniqueName()))
+                {
+                    // Discard updates that originate from this buffer
+                    return;
+                }
+                if (!iuStore.containsKey(iuLinkUpdate.getUid()))
+                {
+                    if (resendActive)
+                    {
+                        triggerResendRequest(event.getData(), getUniqueShortName());
+                    } else {
+                        logger.warn("Link update message for IU which we did not fully receive before.");
+                    }
+                    return;
+                }
+                RemotePushIU iu = this.iuStore.get(iuLinkUpdate.getUid());
+                iu.applyLinkUpdate(iuLinkUpdate);
+                callIuEventHandlers(iu.getUid(), false, IUEventType.LINKSUPDATED, iu.category);
+            }
+            if (event.getData() instanceof IUPayloadUpdate)
+            {
+                IUPayloadUpdate iuUpdate = (IUPayloadUpdate) event.getData();
+                logger.debug("handleIUEvents invoked with an IUPayloadUpdate: {}", iuUpdate);
+                if (iuUpdate.getWriterName().equals(this.getUniqueName()))
+                {
+                    // Discard updates that originate from this buffer
+                    return;
+                }
+                if (!iuStore.containsKey(iuUpdate.getUid()))
+                {
+                    if (resendActive)
+                    {
+                        triggerResendRequest(event.getData(), getUniqueShortName());
+                    } else {
+                        logger.warn("Update message for IU which we did not fully receive before.");
+                    }
+                    return;
+                }
+                RemotePushIU iu = this.iuStore.get(iuUpdate.getUid());
+                iu.applyUpdate(iuUpdate);
+                callIuEventHandlers(iu.getUid(), false, IUEventType.UPDATED, iu.category);
+            }
+            if (event.getData() instanceof IUCommission)
+            {
+                IUCommission iuc = (IUCommission) event.getData();
+                logger.debug("handleIUEvents invoked with an IUCommission: {}", iuc);
+                logger.debug("{}, {}", iuc.getWriterName(), this.getUniqueName());
+
+                if (iuc.getWriterName().equals(this.getUniqueName()))
+                {
+                    // Discard updates that originate from this buffer
+                    return;
+                }
+                if (!iuStore.containsKey(iuc.getUid()))
+                {
+                    if (resendActive)
+                    {
+                        triggerResendRequest(event.getData(), getUniqueShortName());
+                    } else {
+                        logger.warn("Update message for IU which we did not fully receive before.");
+                    }
+                    return;
+                }
+                RemotePushIU iu = this.iuStore.get(iuc.getUid());
+                iu.applyCommmision();
+                iu.setRevision(iuc.getRevision());
+                callIuEventHandlers(iuc.getUid(), false, IUEventType.COMMITTED, iu.getCategory());
+            }
+            if (event.getData() instanceof IURetraction)
+            {
+                IURetraction iuc = (IURetraction) event.getData();
+                logger.debug("handleIUEvents invoked with an IURetraction: {}", iuc);
+                logger.debug("{}", this.getUniqueName());
+
+                if (!iuStore.containsKey(iuc.getUid()))
+                {
+                    logger.warn("Update message for IU which we did not fully receive before.");
+                }
+                RemotePushIU iu = this.iuStore.get(iuc.getUid());
+                if (iu != null) {
+                    iu.applyRetraction();
+                    callIuEventHandlers(iuc.getUid(), false, IUEventType.RETRACTED, iu.getCategory());
+                }
+            }
+        }
+    }
+
+    private void triggerResendRequest(Object aiuObj, String hiddenScopeName)
+    {
+        String uid = null;
+        String writerName = null;
+        if (aiuObj instanceof IULinkUpdate) {
+            IULinkUpdate tmp = (IULinkUpdate)aiuObj;
+            uid = tmp.getUid();
+            writerName = tmp.getWriterName();
+        } else if (aiuObj instanceof IUPayloadUpdate) {
+            IUPayloadUpdate tmp = (IUPayloadUpdate)aiuObj;
+            uid = tmp.getUid();
+            writerName = tmp.getWriterName();
+        } else if (aiuObj instanceof IUCommission) {
+            IUCommission tmp = (IUCommission)aiuObj;
+            uid = tmp.getUid();
+            writerName = tmp.getWriterName();
+        }
+        RemoteServer rServer = null;
+        if (writerName != null)
+            rServer = getRemoteServer(writerName);
+        if ((rServer != null)&&(uid != null)) {
+            IUResendRequest iurr = IUResendRequest.newBuilder().setUid(uid).setHiddenScopeName(hiddenScopeName).build();
+            long rRevision = 0;
+            try
+                {
+                    rRevision = (Long) rServer.call("resendRequest", iurr);
+                }
+                catch (RSBException e)
+                {
+                    throw new RuntimeException(e);
+                }
+                catch (ExecutionException e)
+                {
+                    throw new RuntimeException(e);
+                }
+                catch (TimeoutException e)
+                {
+                    throw new RuntimeException(e);
+                }
+                catch (InterruptedException e)
+                {
+                    throw new RuntimeException(e);
+                }
+            if (rRevision == 0)
+            {
+                //throw new IUResendFailedException(aiu); // TODO
+            }
+        }
+    }
+
+    public InputBuffer(String owningComponentName)
+    {
+        super(owningComponentName);
+    }
+
+    @Override
+    public AbstractIU getIU(String iuid)
+    {
+        if (iuStore.get(iuid) != null)
+        {
+            return iuStore.get(iuid);
+        }
+        else
+        {
+            return messageStore.get(iuid);
+        }
+    }
+
+    public void addCategoryInterest(String... categories)
+    {
+        for(String cat:categories)
+        {
+            createCategoryListenerIfNeeded(cat);
+        }
+    }
+
+    public Collection<RemotePushIU> getIUs()
+    {
+        return iuStore.values();
+    }
+
+}

java/src/ipaaca/IntConverter.java → ipaacalib/java/src/ipaaca/IntConverter.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
 package ipaaca;
 
 import ipaaca.protobuf.Ipaaca.IntMessage;
 
 import java.nio.ByteBuffer;
+
 import rsb.converter.ConversionException;
 import rsb.converter.Converter;
 import rsb.converter.ConverterSignature;
@@ -11,25 +44,27 @@ import rsb.converter.WireContents;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
+/**
+ * Serializer/deserializer for ints
+ * @author hvanwelbergen
+ * 
+ */
 public class IntConverter implements Converter<ByteBuffer>
 {
-    
-    
+
     @Override
     public ConverterSignature getSignature()
     {
-        return new ConverterSignature("int32",Integer.class);
+        return new ConverterSignature("int32", Integer.class);
     }
 
     @Override
     public WireContents<ByteBuffer> serialize(Class<?> typeInfo, Object obj) throws ConversionException
     {
-        Integer intVal = (Integer)obj;
-        IntMessage message = IntMessage.newBuilder()
-            .setValue(intVal)
-            .build();
-        
-        return new WireContents<ByteBuffer>(ByteBuffer.wrap(message.toByteArray()),"int32");        
+        Integer intVal = (Integer) obj;
+        IntMessage message = IntMessage.newBuilder().setValue(intVal).build();
+
+        return new WireContents<ByteBuffer>(ByteBuffer.wrap(message.toByteArray()), "int32");
     }
 
     @Override

java/src/ipaaca/LinkUpdateConverter.java → ipaacalib/java/src/ipaaca/LinkUpdateConverter.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
 package ipaaca;
 
 import ipaaca.protobuf.Ipaaca.IULinkUpdate;
@@ -12,6 +44,11 @@ import rsb.converter.WireContents;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
+/**
+ * Serializer/deserializer for IULinkUpdate
+ * @author hvanwelbergen
+ * 
+ */
 public class LinkUpdateConverter implements Converter<ByteBuffer>
 {
     private static final String LINKUPDATE_WIRESCHEMA = "ipaaca-iu-link-update";
@@ -28,20 +65,20 @@ public class LinkUpdateConverter implements Converter<ByteBuffer>
         {
             throw new RuntimeException(e);
         }
-        return new UserData<IULinkUpdate>(pl, IULinkUpdate.class);   
+        return new UserData<IULinkUpdate>(pl, IULinkUpdate.class);
     }
 
     @Override
     public ConverterSignature getSignature()
     {
-        return new ConverterSignature(LINKUPDATE_WIRESCHEMA,IULinkUpdate.class);
+        return new ConverterSignature(LINKUPDATE_WIRESCHEMA, IULinkUpdate.class);
     }
 
     @Override
     public WireContents<ByteBuffer> serialize(Class<?> typeInfo, Object obj) throws ConversionException
     {
-        IULinkUpdate pl = (IULinkUpdate)obj;
-        return new WireContents<ByteBuffer>(ByteBuffer.wrap(pl.toByteArray()),LINKUPDATE_WIRESCHEMA);        
+        IULinkUpdate pl = (IULinkUpdate) obj;
+        return new WireContents<ByteBuffer>(ByteBuffer.wrap(pl.toByteArray()), LINKUPDATE_WIRESCHEMA);
     }
 
 }

java/src/ipaaca/LocalIU.java → ipaacalib/java/src/ipaaca/LocalIU.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
 package ipaaca;
 
+import ipaaca.protobuf.Ipaaca.IU;
 import ipaaca.protobuf.Ipaaca.IULinkUpdate;
 import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate.Builder;
 import ipaaca.protobuf.Ipaaca.LinkSet;
 import ipaaca.protobuf.Ipaaca.PayloadItem;
 
-import java.rmi.server.UID;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.UUID;
 
 import com.google.common.collect.SetMultimap;
 
 public class LocalIU extends AbstractIU
 {
+    
+    public IU.AccessMode getAccessMode()
+    {
+        return IU.AccessMode.PUSH;
+    }
 
     private OutputBuffer outputBuffer;
 
@@ -33,11 +73,20 @@ public class LocalIU extends AbstractIU
 
     public LocalIU()
     {
-        super(new UID().toString());
+        super(UUID.randomUUID().toString());
         revision = 1;
         payload = new Payload(this);
     }
 
+    public LocalIU(String category)
+    {
+        super(UUID.randomUUID().toString());
+        this.category = category;
+        revision = 1;
+        payload = new Payload(this); 
+    }
+    
+    
     // def _set_buffer(self, buffer):
     // if self._buffer is not None:
     // raise Exception('The IU is already in a buffer, cannot move it.')
@@ -45,7 +94,7 @@ public class LocalIU extends AbstractIU
     // self.owner_name = buffer.unique_name
     // self._payload.owner_name = buffer.unique_name
     //
-    public void setBuffer(OutputBuffer buffer)
+    protected void setBuffer(OutputBuffer buffer)
     {
         if (outputBuffer != null)
         {
@@ -62,6 +111,10 @@ public class LocalIU extends AbstractIU
 
         synchronized (revisionLock)
         {
+            if (isRetracted())
+            {
+                throw new IURetractedException(this);
+            }
             if (committed)
             {
                 throw new IUCommittedException(this);
@@ -70,14 +123,30 @@ public class LocalIU extends AbstractIU
             {
                 increaseRevisionNumber();
                 committed = true;
-                if(outputBuffer!=null)
-                {    
-                    outputBuffer.sendIUCommission(this, writerName);                
+                if (outputBuffer != null)
+                {
+                    outputBuffer.sendIUCommission(this, writerName);
                 }
             }
         }
     }
 
+    private void internalRetract()
+    {
+
+        synchronized (revisionLock)
+        {
+            if (isRetracted())
+                return;
+            increaseRevisionNumber();
+            retracted = true;
+            if (outputBuffer != null)
+            {
+                outputBuffer.sendIURetraction(this);
+            }
+        }
+    }
+
     private void increaseRevisionNumber()
     {
         revision++;
@@ -105,6 +174,10 @@ public class LocalIU extends AbstractIU
     @Override
     void modifyLinks(boolean isDelta, SetMultimap<String, String> linksToAdd, SetMultimap<String, String> linksToRemove, String writerName)
     {
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
         if (isCommitted())
         {
             throw new IUCommittedException(this);
@@ -112,7 +185,7 @@ public class LocalIU extends AbstractIU
         synchronized (revisionLock)
         {
             increaseRevisionNumber();
-            if(isPublished())
+            if (isPublished())
             {
                 String wName = null;
                 if (getBuffer() != null)
@@ -127,24 +200,19 @@ public class LocalIU extends AbstractIU
                 {
                     wName = null;
                 }
-                Set<LinkSet> addSet = new HashSet<LinkSet>();                
-                for(Entry<String, Collection<String>> entry :linksToAdd.asMap().entrySet())
+                Set<LinkSet> addSet = new HashSet<LinkSet>();
+                for (Entry<String, Collection<String>> entry : linksToAdd.asMap().entrySet())
                 {
                     addSet.add(LinkSet.newBuilder().setType(entry.getKey()).addAllTargets(entry.getValue()).build());
                 }
-                Set<LinkSet> removeSet = new HashSet<LinkSet>();                
-                for(Entry<String, Collection<String>> entry :linksToRemove.asMap().entrySet())
+                Set<LinkSet> removeSet = new HashSet<LinkSet>();
+                for (Entry<String, Collection<String>> entry : linksToRemove.asMap().entrySet())
                 {
                     removeSet.add(LinkSet.newBuilder().setType(entry.getKey()).addAllTargets(entry.getValue()).build());
                 }
-                outputBuffer.sendIULinkUpdate(this,IULinkUpdate.newBuilder()
-                        .setUid(getUid())
-                        .setRevision(getRevision())
-                        .setWriterName(wName)
-                        .setIsDelta(isDelta)
-                        .addAllNewLinks(addSet)
-                        .addAllLinksToRemove(removeSet)
-                        .build());
+                outputBuffer.sendIULinkUpdate(this,
+                        IULinkUpdate.newBuilder().setUid(getUid()).setRevision((int) getRevision()).setWriterName(wName).setIsDelta(isDelta)
+                                .addAllNewLinks(addSet).addAllLinksToRemove(removeSet).build());
             }
         }
     }
@@ -188,31 +256,81 @@ public class LocalIU extends AbstractIU
             {
                 throw new IUCommittedException(this);
             }
+            if (isRetracted())
+            {
+                throw new IURetractedException(this);
+            }
             increaseRevisionNumber();
             if (isPublished())
             {
                 // send update to remote holders
-                PayloadItem newItem = PayloadItem.newBuilder().setKey(key).setValue(value).setType("") // TODO: fix this, default in .proto?
+                PayloadItem newItem = PayloadItem.newBuilder().setKey(key).setValue(value).setType("STR")
                         .build();
-                IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision(getRevision()).setIsDelta(true)
+                IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision((int) getRevision()).setIsDelta(true)
                         .setWriterName(writer == null ? getOwnerName() : writer).addNewItems(newItem).build();
                 getOutputBuffer().sendIUPayloadUpdate(this, update);
             }
         }
     }
+    
+    @Override
+    void putIntoPayload(Map<? extends String, ? extends String> newItems, String writer)
+    {
+        synchronized (getRevisionLock())
+        {
+            // set item locally
+            if (isCommitted())
+            {
+                throw new IUCommittedException(this);
+            }
+            if (isRetracted())
+            {
+                throw new IURetractedException(this);
+            }
+            increaseRevisionNumber();
+            if (isPublished())
+            {
+            	Builder builder = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision((int) getRevision()).setIsDelta(true)
+                        .setWriterName(writer == null ? getOwnerName() : writer);
+            	for (Map.Entry<? extends String, ? extends String> item : newItems.entrySet())
+            	{
+            		PayloadItem newItem = PayloadItem.newBuilder().setKey(item.getKey()).setValue(item.getValue()).setType("STR")
+                            .build();
+            		builder.addNewItems(newItem);
+            	    
+            	}
+            	IUPayloadUpdate update = builder.build();
+                getOutputBuffer().sendIUPayloadUpdate(this, update);
+            }
+        }
+    }
 
     @Override
     public void commit()
     {
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
         internalCommit(null);
     }
 
     @Override
     public void commit(String writerName)
     {
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
         internalCommit(writerName);
     }
 
+    @Override
+    public void retract()
+    {
+        internalRetract();
+    }
+
     @Override
     void removeFromPayload(Object key, String writer)
     {
@@ -222,11 +340,15 @@ public class LocalIU extends AbstractIU
             {
                 throw new IUCommittedException(this);
             }
+            if (isRetracted())
+            {
+                throw new IURetractedException(this);
+            }
             increaseRevisionNumber();
             if (isPublished())
             {
                 // send update to remote holders
-                IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision(getRevision()).setIsDelta(true)
+                IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision((int) getRevision()).setIsDelta(true)
                         .setWriterName(writer == null ? getOwnerName() : writer).addKeysToRemove((String) key).build();
                 getOutputBuffer().sendIUPayloadUpdate(this, update);
             }
@@ -239,9 +361,15 @@ public class LocalIU extends AbstractIU
     {
         if (isPublished())
         {
-            IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision(getRevision()).setIsDelta(false)
+            IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision((int) getRevision()).setIsDelta(false)
                     .setWriterName(writerName == null ? getOwnerName() : writerName).addAllNewItems(newPayload).build();
             getOutputBuffer().sendIUPayloadUpdate(this, update);
         }
     }
+    
+    @Override
+    public String toString()
+    {
+        return "LocalIU with category: "+this.getCategory() + "\nowner: "+getOwnerName()+"\npayload: "+this.getPayload();
+    }
 }

ipaacalib/java/src/ipaaca/LocalMessageIU.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2015 Social Cognitive Systems Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+import ipaaca.protobuf.Ipaaca.IU;
+
+/**
+ * Local IU of Message sub-type. Can be handled like a normal IU, but on the remote side it is only existent during the handler calls.
+ * @author hvanwelbergen
+ */
+public class LocalMessageIU extends LocalIU
+{
+
+    public LocalMessageIU()
+    {
+        super();
+    }
+
+    public LocalMessageIU(String category)
+    {
+        super(category);
+    }
+
+    public IU.AccessMode getAccessMode()
+    {
+        return IU.AccessMode.MESSAGE;
+    }
+
+}

java/src/ipaaca/OutputBuffer.java → ipaacalib/java/src/ipaaca/OutputBuffer.java

-package ipaaca;
 
-import rsb.Factory;
-import rsb.Informer;
-import rsb.InitializeException;
-import rsb.RSBException;
-import rsb.patterns.DataCallback;
-import rsb.patterns.LocalServer;
+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".
+ *
+ * Copyright (c) 2009-2015 Social Cognitive Systems Group
+ *                         CITEC, Bielefeld University
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
 
 import ipaaca.protobuf.Ipaaca;
 import ipaaca.protobuf.Ipaaca.IUCommission;
+import ipaaca.protobuf.Ipaaca.IURetraction;
+import ipaaca.protobuf.Ipaaca.IUResendRequest;
 import ipaaca.protobuf.Ipaaca.IULinkUpdate;
 import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
 import ipaaca.protobuf.Ipaaca.LinkSet;
@@ -17,9 +45,20 @@ import ipaaca.protobuf.Ipaaca.PayloadItem;
 import java.util.HashMap;
 import java.util.Map;
 
+import lombok.extern.slf4j.Slf4j;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import rsb.Factory;
+import rsb.Informer;
+import rsb.InitializeException;
+import rsb.RSBException;
+import rsb.patterns.DataCallback;
+import rsb.patterns.EventCallback;
+import rsb.patterns.LocalServer;
+import rsb.Event;
+
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
 
@@ -27,6 +66,7 @@ import com.google.common.collect.SetMultimap;
  * An OutputBuffer that holds local IUs.
  * @author hvanwelbergen
  */
+@Slf4j
 public class OutputBuffer extends Buffer
 {
 
@@ -34,6 +74,7 @@ public class OutputBuffer extends Buffer
     private Map<String, Informer<Object>> informerStore = new HashMap<String, Informer<Object>>(); // category -> informer map
     private final static Logger logger = LoggerFactory.getLogger(OutputBuffer.class.getName());
     private IUStore<LocalIU> iuStore = new IUStore<LocalIU>();
+    private String channel = "default";
 
     // def __init__(self, owning_component_name, participant_config=None):
     // '''Create an Output Buffer.
@@ -55,10 +96,20 @@ public class OutputBuffer extends Buffer
      * @param owningComponentName name of the entity that own this buffer
      */
     public OutputBuffer(String owningComponentName)
+    {
+        this(owningComponentName, "default");
+
+    }
+
+    /**
+     * @param owningComponentName name of the entity that own this buffer
+     * @param channel name of the ipaaca channel this buffer is using
+     */
+    public OutputBuffer(String owningComponentName, String ipaaca_channel)
     {
         super(owningComponentName);
 
-        uniqueName = "/ipaaca/component/" + owningComponentName + "ID" + uuid + "/OB";
+        uniqueName = "/ipaaca/component/" + getUniqueShortName() + "/OB";
         logger.debug("Creating server for {}", uniqueName);
         server = Factory.getInstance().createLocalServer(uniqueName);
         try
@@ -66,46 +117,74 @@ public class OutputBuffer extends Buffer
             server.addMethod("updatePayload", new RemoteUpdatePayload());
             server.addMethod("updateLinks", new RemoteUpdateLinks());
             server.addMethod("commit", new RemoteCommit());
+	    // add method to trigger a resend request. (dlw)
+	    server.addMethod("resendRequest", new RemoteResendRequest());
             server.activate();
         }
         catch (InitializeException e)
         {
             throw new RuntimeException(e);
         }
+        catch (RSBException e)
+        {
+            throw new RuntimeException(e);
+        }
 
+        this.channel = ipaaca_channel;
     }
 
-    private final class RemoteUpdatePayload implements DataCallback<Integer, IUPayloadUpdate>
+    private final class RemoteUpdatePayload extends EventCallback //DataCallback<Long, IUPayloadUpdate>
     {
         @Override
-        public Integer invoke(IUPayloadUpdate data) throws Throwable
+        public Event invoke(final Event request) //throws Throwable
         {
             logger.debug("remoteUpdate");
-            return remoteUpdatePayload(data);
+            long result = remoteUpdatePayload((IUPayloadUpdate) request.getData());
+            //System.out.println("remoteUpdatePayload yielded revision "+result);
+            return new Event(Long.class, new Long(result));
         }
 
     }
+    /*private final class RemoteUpdatePayload extends DataCallback<Long, IUPayloadUpdate>
+    {
+        @Override
+        public Long invoke(IUPayloadUpdate data) throws Throwable
+        {
+            logger.debug("remoteUpdate");
+            return remoteUpdatePayload(data);
+        }
 
-    private final class RemoteUpdateLinks implements DataCallback<Integer, IULinkUpdate>
+    }*/
+
+    private final class RemoteUpdateLinks extends EventCallback // DataCallback<Long, IULinkUpdate>
     {
         @Override
-        public Integer invoke(IULinkUpdate data) throws Throwable
+        public Event invoke(final Event request) //throws Throwable
         {
             logger.debug("remoteUpdateLinks");
-            return remoteUpdateLinks(data);
+            return new Event(Long.class, new Long(remoteUpdateLinks((IULinkUpdate) request.getData())));
         }
 
     }
 
-    private final class RemoteCommit implements DataCallback<Integer, IUCommission>
+    private final class RemoteCommit extends EventCallback //DataCallback<Long, IUCommission>
     {
         @Override
-        public Integer invoke(IUCommission data) throws Throwable
+        public Event invoke(final Event request) //throws Throwable
         {
             logger.debug("remoteCommit");
-            return remoteCommit(data);
+            return new Event(Long.class, new Long(remoteCommit((IUCommission) request.getData())));
         }
+    }
 
+    private final class RemoteResendRequest extends EventCallback //DataCallback<Long, IUResendRequest>
+    {
+        @Override
+        public Event invoke(final Event request) //throws Throwable
+        {
+            logger.debug("remoteResendRequest");
+            return new Event(Long.class, new Long(remoteResendRequest((IUResendRequest) request.getData())));
+        }
     }
 
     // def _remote_update_payload(self, update):
@@ -132,7 +211,7 @@ public class OutputBuffer extends Buffer
      * Apply a remotely requested update to one of the stored IUs.
      * @return 0 if not updated, IU version number otherwise
      */
-    int remoteUpdatePayload(IUPayloadUpdate update)
+    long remoteUpdatePayload(IUPayloadUpdate update)
     {
         if (!iuStore.containsKey(update.getUid()))
         {
@@ -153,14 +232,20 @@ public class OutputBuffer extends Buffer
             {
                 iu.getPayload().remove(k, update.getWriterName());
             }
-            for (PayloadItem pli : update.getNewItemsList())
+            if (update.getNewItemsList().size() > 0)
             {
-                iu.getPayload().put(pli.getKey(), pli.getValue(), update.getWriterName());
+            	HashMap<String, String> payloadUpdate = new HashMap<String, String>();
+
+            	for (PayloadItem pli : update.getNewItemsList())
+            	{
+            		payloadUpdate.put(pli.getKey(), pli.getValue());
+            		//    //iu.getPayload().put(pli.getKey(), pli.getValue(), update.getWriterName());
+            	}
+            	iu.getPayload().putAll(payloadUpdate, update.getWriterName());
             }
         }
         else
         {
-
             iu.setPayload(update.getNewItemsList(), update.getWriterName());
         }
         callIuEventHandlers(update.getUid(), true, IUEventType.UPDATED, iu.getCategory());
@@ -171,7 +256,7 @@ public class OutputBuffer extends Buffer
      * Apply a remotely requested update to one of the stored IUs.
      * @return 0 if not updated, IU version number otherwise
      */
-    int remoteUpdateLinks(IULinkUpdate update)
+    long remoteUpdateLinks(IULinkUpdate update)
     {
         if (!iuStore.containsKey(update.getUid()))
         {
@@ -234,7 +319,7 @@ public class OutputBuffer extends Buffer
     /**
      * Apply a remotely requested commit to one of the stored IUs.
      */
-    private int remoteCommit(IUCommission iuc)
+    private long remoteCommit(IUCommission iuc)
     {
         if (!iuStore.containsKey(iuc.getUid()))
         {
@@ -260,6 +345,35 @@ public class OutputBuffer extends Buffer
         }
     }
 
+    /*
+     * Resend an requested iu over the specific hidden channel. (dlw) TODO
+     */
+    private long remoteResendRequest(IUResendRequest iu_resend_request_pack)
+    {
+        if (!iuStore.containsKey(iu_resend_request_pack.getUid()))
+        {
+            logger.warn("Remote InBuffer tried to spuriously write non-existent IU {}", iu_resend_request_pack.getUid());
+            return 0;
+        }
+        AbstractIU iu = iuStore.get(iu_resend_request_pack.getUid());
+        if ((iu_resend_request_pack.hasHiddenScopeName() == true)&&(!iu_resend_request_pack.getHiddenScopeName().equals("")))
+        {
+	    Informer<Object> informer = getInformer(iu_resend_request_pack.getHiddenScopeName());
+            try
+            {
+                informer.publish(iu);
+            }
+            catch (RSBException e)
+            {
+                throw new RuntimeException(e);
+            }
+            return iu.getRevision();
+        } else
+        {
+            return 0;
+        }
+    }
+
     // def _get_informer(self, iu_category):
     // '''Return (or create, store and return) an informer object for IUs of the specified category.'''
     // if iu_category in self._informer_store:
@@ -281,12 +395,19 @@ public class OutputBuffer extends Buffer
         {
             return informerStore.get(category);
         }
-        Informer<Object> informer = Factory.getInstance().createInformer("/ipaaca/category/" + category);
+        Informer<Object> informer;
+        try
+        {
+            informer = Factory.getInstance().createInformer("/ipaaca/channel/" + this.channel + "/category/" + category);
+        }
+        catch (InitializeException e1)
+        {
+            throw new RuntimeException(e1);
+        }
 
         informerStore.put(category, informer);
-        logger.info("Added informer on " + category);
+        logger.info("Added informer on channel " + this.channel + " and category " + category);
 
-        // XXX new in java version, apperently informers need activation and deactivation
         try
         {
             informer.activate();
@@ -295,6 +416,10 @@ public class OutputBuffer extends Buffer
         {
             throw new RuntimeException(e);
         }
+        catch (RSBException e)
+        {
+            throw new RuntimeException(e);
+        }
         return informer;
     }
 
@@ -315,7 +440,10 @@ public class OutputBuffer extends Buffer
         {
             throw new IUPublishedException(iu);
         }
-        iuStore.put(iu.getUid(), iu);
+        if(!(iu instanceof LocalMessageIU))
+        {
+            iuStore.put(iu.getUid(), iu);
+        }
         iu.setBuffer(this);
         publishIU(iu);
     }
@@ -324,12 +452,12 @@ public class OutputBuffer extends Buffer
     // '''Publish an IU.'''
     // informer = self._get_informer(iu._category)
     // informer.publishData(iu)
-    public void publishIU(AbstractIU iu)
+    private void publishIU(AbstractIU iu)
     {
         Informer<Object> informer = getInformer(iu.getCategory());
         try
         {
-            informer.send(iu);
+            informer.publish(iu);
         }
         catch (RSBException e)
         {
@@ -361,14 +489,28 @@ public class OutputBuffer extends Buffer
      *            to enable remote components to filter out updates that originated
      *            from their own operations
      */
-    public void sendIUCommission(AbstractIU iu, String writerName)
+    protected void sendIUCommission(AbstractIU iu, String writerName)
     {
-        IUCommission iuc = Ipaaca.IUCommission.newBuilder().setUid(iu.getUid()).setRevision(iu.getRevision())
-                .setWriterName(iu.getOwnerName() != null ? iu.getOwnerName() : writerName).build();
+        IUCommission iuc = Ipaaca.IUCommission.newBuilder().setUid(iu.getUid()).setRevision((int) iu.getRevision())
+                .setWriterName(writerName == null ? iu.getOwnerName() : writerName).build();
         Informer<Object> informer = getInformer(iu.getCategory());
         try
         {
-            informer.send(iuc);
+            informer.publish(iuc);
+        }
+        catch (RSBException e)
+        {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected void sendIURetraction(AbstractIU iu)
+    {
+        IURetraction iuc = Ipaaca.IURetraction.newBuilder().setUid(iu.getUid()).setRevision((int) iu.getRevision()).build();
+        Informer<Object> informer = getInformer(iu.getCategory());
+        try
+        {
+            informer.publish(iuc);
         }
         catch (RSBException e)
         {
@@ -403,12 +545,12 @@ public class OutputBuffer extends Buffer
     // informer = self._get_informer(iu._category)
     // informer.publishData(payload_update)
 
-    public void sendIUPayloadUpdate(AbstractIU iu, IUPayloadUpdate update)
+    protected void sendIUPayloadUpdate(AbstractIU iu, IUPayloadUpdate update)
     {
         Informer<Object> informer = getInformer(iu.getCategory());
         try
         {
-            informer.send(update);
+            informer.publish(update);
         }
         catch (RSBException e)
         {
@@ -416,12 +558,12 @@ public class OutputBuffer extends Buffer
         }
     }
 
-    public void sendIULinkUpdate(AbstractIU iu, IULinkUpdate update)
+    protected void sendIULinkUpdate(AbstractIU iu, IULinkUpdate update)
     {
         Informer<Object> informer = getInformer(iu.getCategory());
         try
         {
-            informer.send(update);
+            informer.publish(update);
         }
         catch (RSBException e)
         {
@@ -437,10 +579,32 @@ public class OutputBuffer extends Buffer
 
     public void close()
     {
-        server.deactivate();
+        try
+        {
+            server.deactivate();
+        }
+        catch (RSBException e)
+        {
+            log.warn("RSBException on deactivating server in close", e);
+        }
+        catch (InterruptedException e)
+        {
+            Thread.currentThread().interrupt();
+        }
         for (Informer<?> informer : informerStore.values())
         {
-            informer.deactivate();
+            try
+            {
+                informer.deactivate();
+            }
+            catch (RSBException e)
+            {
+                log.warn("RSBException on deactivating informer {} in close", e, informer.toString());
+            }
+            catch (InterruptedException e)
+            {
+                Thread.currentThread().interrupt();
+            }
         }
     }
 }

java/src/ipaaca/Payload.java → ipaacalib/java/src/ipaaca/Payload.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
 package ipaaca;
 
 import ipaaca.protobuf.Ipaaca.PayloadItem;
 
+import org.apache.commons.lang.StringEscapeUtils;
+
+import com.google.common.collect.ImmutableSet;
+
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15,76 +52,78 @@ import java.util.Set;
  */
 public class Payload implements Map<String, String>
 {
-    private Map<String, String> map = new HashMap<String, String>();
+    private Map<String, String> map = Collections.synchronizedMap(new HashMap<String, String>());
     private final AbstractIU iu;
 
     public Payload(AbstractIU iu)
     {
         this.iu = iu;
     }
-    
-    // def __init__(self, remote_push_iu, new_payload):
-    // """Create remote payload object.
-    //
-    // Keyword arguments:
-    // remote_push_iu -- remote IU holding this payload
-    // new_payload -- payload dict to initialise this remote payload with
-    // """
-    // super(RemotePushPayload, self).__init__()
-    // self._remote_push_iu = remote_push_iu
-    // if new_payload is not None:
-    // for k,v in new_payload.items():
-    // dict.__setitem__(self, k, v)    
+
     public Payload(AbstractIU iu, List<PayloadItem> payloadItems)
     {
-        this(iu,payloadItems,null);      
+        this(iu, payloadItems, null);
     }
-    
-    public Payload(AbstractIU iu, Map<String,String> newPayload)
+
+    public Payload(AbstractIU iu, Map<String, String> newPayload)
     {
-        this(iu,newPayload,null);      
+        this(iu, newPayload, null);
     }
-    
-    public Payload(AbstractIU iu, Map<String,String> newPayload, String writerName)
+
+    public Payload(AbstractIU iu, Map<String, String> newPayload, String writerName)
     {
         this.iu = iu;
         set(newPayload, writerName);
     }
-    
-    public Payload(AbstractIU iu, List<PayloadItem>newPayload, String writerName)
+
+    public Payload(AbstractIU iu, List<PayloadItem> newPayload, String writerName)
     {
         this.iu = iu;
-        set(newPayload,writerName);       
+        set(newPayload, writerName);
     }
-    
-    public void set(Map<String,String> newPayload, String writerName)
+
+    public void set(Map<String, String> newPayload, String writerName)
     {
         iu.setPayload(newPayload, writerName);
-        map.clear();
-        map.putAll(newPayload);
+        synchronized(map)
+        {
+            map.clear();
+            map.putAll(newPayload);
+        }
     }
-    
-    public void set(List<PayloadItem>newPayload, String writerName)
+
+    public void set(List<PayloadItem> newPayload, String writerName)
     {
-        iu.handlePayloadSetting(newPayload,writerName);
-        map.clear();
-        for (PayloadItem item : newPayload)
+        iu.handlePayloadSetting(newPayload, writerName);
+        synchronized(map)
         {
-            map.put(item.getKey(), item.getValue());
+            map.clear();
+            for (PayloadItem item : newPayload)
+            {
+                map.put(item.getKey(), pseudoConvertFromJSON(item.getValue(), item.getType()));
+            }
         }
     }
-    
-    // def _remotely_enforced_setitem(self, k, v):
-    // """Sets an item when requested remotely."""
-    // return dict.__setitem__(self, k, v)
+
+    public String pseudoConvertFromJSON(String value, String type) {
+        if (type.equals("JSON")) {
+            if (value.startsWith("\"")) {
+                //return value.replaceAll("\\\"", "");
+                return StringEscapeUtils.unescapeJava(value.substring(1, value.length() - 1));
+            } else if (value.startsWith("{") || value.startsWith("[") || value.matches("true") || value.matches("false") || value.matches("-?[0-9]*[.,]?[0-9][0-9]*.*")) { 
+                return value;
+            } else if (value.equals("null")) {
+                return "";
+            }
+        }
+        return value;
+    }
+
     void enforcedSetItem(String key, String value)
     {
         map.put(key, value);
     }
 
-    // def _remotely_enforced_delitem(self, k):
-    // """Deletes an item when requested remotely."""
-    // return dict.__delitem__(self, k)
     void enforcedRemoveItem(String key)
     {
         map.remove(key);
@@ -106,9 +145,12 @@ public class Payload implements Map<String, String>
         return map.containsValue(value);
     }
 
-    public Set<java.util.Map.Entry<String, String>> entrySet()
+    /**
+     * Provides an immutable copy of the entryset of the Payload
+     */
+    public ImmutableSet<java.util.Map.Entry<String, String>> entrySet()
     {
-        return map.entrySet();
+        return ImmutableSet.copyOf(map.entrySet());
     }
 
     public boolean equals(Object o)
@@ -136,31 +178,6 @@ public class Payload implements Map<String, String>
         return map.keySet();
     }
 
-    // def __setitem__(self, k, v):
-    // """Set item in this payload.
-    //
-    // Requests item setting from the OutputBuffer holding the local version
-    // of this IU. Returns when permission is granted and item is set;
-    // otherwise raises an IUUpdateFailedError.
-    // """
-    // if self._remote_push_iu.committed:
-    // raise IUCommittedError(self._remote_push_iu)
-    // if self._remote_push_iu.read_only:
-    // raise IUReadOnlyError(self._remote_push_iu)
-    // requested_update = IUPayloadUpdate(
-    // uid=self._remote_push_iu.uid,
-    // revision=self._remote_push_iu.revision,
-    // is_delta=True,
-    // writer_name=self._remote_push_iu.buffer.unique_name,
-    // new_items={k:v},
-    // keys_to_remove=[])
-    // remote_server = self._remote_push_iu.buffer._get_remote_server(self._remote_push_iu)
-    // new_revision = remote_server.updatePayload(requested_update)
-    // if new_revision == 0:
-    // raise IUUpdateFailedError(self._remote_push_iu)
-    // else:
-    // self._remote_push_iu._revision = new_revision
-    // dict.__setitem__(self, k, v)    
     /**
      * Set item in this payload.
      * Requests item setting from the OutputBuffer holding the local version
@@ -173,38 +190,12 @@ public class Payload implements Map<String, String>
         return map.put(key, value);
     }
 
-    //
-    // def __delitem__(self, k):
-    // """Delete item in this payload.
-    //
-    // Requests item deletion from the OutputBuffer holding the local version
-    // of this IU. Returns when permission is granted and item is deleted;
-    // otherwise raises an IUUpdateFailedError.
-    // """
-    // if self._remote_push_iu.committed:
-    // raise IUCommittedError(self._remote_push_iu)
-    // if self._remote_push_iu.read_only:
-    // raise IUReadOnlyError(self._remote_push_iu)
-    // requested_update = IUPayloadUpdate(
-    // uid=self._remote_push_iu.uid,
-    // revision=self._remote_push_iu.revision,
-    // is_delta=True,
-    // writer_name=self._remote_push_iu.buffer.unique_name,
-    // new_items={},
-    // keys_to_remove=[k])
-    // remote_server = self._remote_push_iu.buffer._get_remote_server(self._remote_push_iu)
-    // new_revision = remote_server.updatePayload(requested_update)
-    // if new_revision == 0:
-    // raise IUUpdateFailedError(self._remote_push_iu)
-    // else:
-    // self._remote_push_iu._revision = new_revision
-    // dict.__delitem__(self, k)
     /**
      * Delete item in this payload.//
      * Requests item deletion from the OutputBuffer holding the local version
      * of this IU. Returns when permission is granted and item is deleted;
      * otherwise raises an IUUpdateFailedError.
-     */    
+     */
     public String remove(Object key, String writer)
     {
         iu.removeFromPayload(key, writer);
@@ -216,9 +207,20 @@ public class Payload implements Map<String, String>
         return put(key, value, null);
     }
 
-    public void putAll(Map<? extends String, ? extends String> m)
+    
+    public void putAll(Map<? extends String, ? extends String> newItems)
+    {
+        putAll(newItems, null);
+    }
+
+    public void putAll(Map<? extends String, ? extends String> newItems, String writer)
     {
-        throw new RuntimeException("Not implemented");
+        iu.putIntoPayload(newItems, writer);
+   		map.putAll(newItems);
+    }
+    
+    public void merge(Map<? extends String, ? extends String> items) {
+    	putAll(items, null);
     }
 
     public String remove(Object key)
@@ -235,4 +237,10 @@ public class Payload implements Map<String, String>
     {
         return map.values();
     }
+    
+    @Override
+    public String toString()
+    {
+        return map.toString();
+    }
 }

java/src/ipaaca/PayloadConverter.java → ipaacalib/java/src/ipaaca/PayloadConverter.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
 package ipaaca;
 
 import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
@@ -12,6 +44,11 @@ import rsb.converter.WireContents;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
+/**
+ * Serializer/deserializer for IUPayloadUpdate
+ * @author hvanwelbergen
+ * 
+ */
 public class PayloadConverter implements Converter<ByteBuffer>
 {
     private static final String PAYLOAD_WIRESCHEMA = "ipaaca-iu-payload-update";
@@ -28,20 +65,20 @@ public class PayloadConverter implements Converter<ByteBuffer>
         {
             throw new RuntimeException(e);
         }
-        return new UserData<IUPayloadUpdate>(pl, IUPayloadUpdate.class);   
+        return new UserData<IUPayloadUpdate>(pl, IUPayloadUpdate.class);
     }
 
     @Override
     public ConverterSignature getSignature()
     {
-        return new ConverterSignature(PAYLOAD_WIRESCHEMA,IUPayloadUpdate.class);
+        return new ConverterSignature(PAYLOAD_WIRESCHEMA, IUPayloadUpdate.class);
     }
 
     @Override
     public WireContents<ByteBuffer> serialize(Class<?> typeInfo, Object obj) throws ConversionException
     {
-        IUPayloadUpdate pl = (IUPayloadUpdate)obj;
-        return new WireContents<ByteBuffer>(ByteBuffer.wrap(pl.toByteArray()),PAYLOAD_WIRESCHEMA);        
+        IUPayloadUpdate pl = (IUPayloadUpdate) obj;
+        return new WireContents<ByteBuffer>(ByteBuffer.wrap(pl.toByteArray()), PAYLOAD_WIRESCHEMA);
     }
 
 }

ipaacalib/java/src/ipaaca/RemoteMessageIU.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2015 Social Cognitive Systems Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
+package ipaaca;
+
+import ipaaca.protobuf.Ipaaca.IU;
+import ipaaca.protobuf.Ipaaca.PayloadItem;
+
+import java.util.List;
+import java.util.Map;
+
+import lombok.extern.slf4j.Slf4j;
+
+import com.google.common.collect.SetMultimap;
+
+@Slf4j
+public class RemoteMessageIU extends AbstractIU
+{
+
+    public IU.AccessMode getAccessMode()
+    {
+        return IU.AccessMode.MESSAGE;
+    }
+
+    public RemoteMessageIU(String uid)
+    {
+        super(uid);
+        payload = new Payload(this);
+    }
+
+    @Override
+    public void commit()
+    {
+        log.info("Info: committing to a RemoteMessage only has local effects");
+        committed = true;
+    }
+
+    @Override
+    public void retract()
+    {
+        log.info("Retracting a RemoteMessage has no effect.");
+    }    
+
+    @Override
+    public void commit(String writerName)
+    {
+        log.info("Info: committing to a RemoteMessage only has local effects");
+        committed = true;        
+    }
+
+    @Override
+    void setPayload(List<PayloadItem> newItems, String writerName)
+    {
+        for(PayloadItem item:newItems)
+        {
+            payload.put(item.getKey(),item.getValue());
+        }
+        log.info("Info: modifying a RemoteMessage only has local effects");
+    }
+
+    @Override
+    void putIntoPayload(String key, String value, String writer)
+    {
+        payload.put(key,value);
+        log.info("Info: modifying a RemoteMessage only has local effects");
+    }
+    
+    void putIntoPayload(Map<? extends String, ? extends String> newItems, String writer) {
+    	for (Map.Entry<? extends String, ? extends String> item : newItems.entrySet())
+    	{
+    		payload.put(item.getKey(), item.getValue());
+    	    //System.out.println(entry.getKey() + "/" + entry.getValue());
+    	}
+    	log.info("Info: modifying a RemoteMessage only has local effects");
+    }
+
+    @Override
+    void removeFromPayload(Object key, String writer)
+    {
+        payload.remove(key);
+        log.info("Info: modifying a RemoteMessage only has local effects");
+    }
+
+    @Override
+    void handlePayloadSetting(List<PayloadItem> newPayload, String writerName)
+    {
+                
+    }
+
+    @Override
+    void modifyLinks(boolean isDelta, SetMultimap<String, String> linksToAdd, SetMultimap<String, String> linksToRemove, String Writer)
+    {
+        log.info("Info: modifying a RemoteMessage only has local effects");        
+    }
+    
+}

java/src/ipaaca/RemotePushIU.java → ipaacalib/java/src/ipaaca/RemotePushIU.java

+/*
+ * This file is part of IPAACA, the
+ *  "Incremental Processing Architecture
+ *   for Artificial Conversational Agents".  
+ *
+ * Copyright (c) 2009-2013 Sociable Agents Group
+ *                         CITEC, Bielefeld University   
+ *
+ * http://opensource.cit-ec.de/projects/ipaaca/
+ * http://purl.org/net/ipaaca
+ *
+ * This file may be licensed under the terms of of the
+ * GNU Lesser General Public License Version 3 (the ``LGPL''),
+ * or (at your option) any later version.
+ *
+ * Software distributed under the License is distributed
+ * on an ``AS IS'' basis, WITHOUT WARRANTY OF ANY KIND, either
+ * express or implied. See the LGPL for the specific language
+ * governing rights and limitations.
+ *
+ * You should have received a copy of the LGPL along with this
+ * program. If not, go to http://www.gnu.org/licenses/lgpl.html
+ * or write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  
+ *
+ * The development of this software was supported by the
+ * Excellence Cluster EXC 277 Cognitive Interaction Technology.
+ * The Excellence Cluster EXC 277 is a grant of the Deutsche
+ * Forschungsgemeinschaft (DFG) in the context of the German
+ * Excellence Initiative.
+ */
+
 package ipaaca;
 
 import ipaaca.protobuf.Ipaaca;
+import ipaaca.protobuf.Ipaaca.IU;
 import ipaaca.protobuf.Ipaaca.IUCommission;
 import ipaaca.protobuf.Ipaaca.IULinkUpdate;
 import ipaaca.protobuf.Ipaaca.IUPayloadUpdate;
 import ipaaca.protobuf.Ipaaca.LinkSet;
 import ipaaca.protobuf.Ipaaca.PayloadItem;
+import ipaaca.protobuf.Ipaaca.IUPayloadUpdate.Builder;
 
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.SetMultimap;
-
 import rsb.RSBException;
 import rsb.patterns.RemoteServer;
 
+import com.google.common.collect.SetMultimap;
+
 /**
  * A remote IU with access mode 'PUSH'.
  * @author hvanwelbergen
@@ -30,19 +67,16 @@ public class RemotePushIU extends AbstractIU
     private final static Logger logger = LoggerFactory.getLogger(RemotePushIU.class.getName());
     private InputBuffer inputBuffer;
 
+    public IU.AccessMode getAccessMode()
+    {
+        return IU.AccessMode.PUSH;
+    }
+
     public InputBuffer getInputBuffer()
     {
         return inputBuffer;
     }
 
-    // def __init__(self, uid, revision, read_only, owner_name, category, type, committed, payload):
-    // super(RemotePushIU, self).__init__(uid=uid, access_mode=IUAccessMode.PUSH, read_only=read_only)
-    // self._revision = revision
-    // self._category = category
-    // self.owner_name = owner_name
-    // self._type = type
-    // self._committed = committed
-    // self._payload = RemotePushPayload(remote_push_iu=self, new_payload=payload)
     public RemotePushIU(String uid)
     {
         super(uid);
@@ -56,9 +90,9 @@ public class RemotePushIU extends AbstractIU
     }
 
     @Override
-    public void commit()
+    public void retract()
     {
-        commit(null);
+        logger.info("Retracting a RemoteIU has no effect.");
     }
 
     void putIntoPayload(String key, String value, String writer)
@@ -67,25 +101,43 @@ public class RemotePushIU extends AbstractIU
         {
             throw new IUCommittedException(this);
         }
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
         if (isReadOnly())
         {
             throw new IUReadOnlyException(this);
         }
-        PayloadItem newItem = PayloadItem.newBuilder().setKey(key).setValue(value).setType("").build();// TODO use default type in .proto
-        IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setIsDelta(true).setUid(getUid()).setRevision(getRevision())
+        PayloadItem newItem = PayloadItem.newBuilder().setKey(key).setValue(value).setType("STR").build();
+        IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setIsDelta(true).setUid(getUid()).setRevision((int) getRevision())
                 .setWriterName(getBuffer().getUniqueName()).addNewItems(newItem).build();
 
         RemoteServer server = getInputBuffer().getRemoteServer(this);
         logger.debug("Remote server has methods {}", server.getMethods());
-        int newRevision;
+        long newRevision;
         try
         {
-            newRevision = (Integer) server.call("updatePayload", update);
+            //System.out.println("calling remote updatePayload ...");
+            newRevision = (Long) server.call("updatePayload", update);
+            //System.out.println(" ... done");
         }
         catch (RSBException e)
         {
             throw new RuntimeException(e);
         }
+        catch (ExecutionException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (TimeoutException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (InterruptedException e)
+        {
+            throw new RuntimeException(e);
+        }
         if (newRevision == 0)
         {
             throw new IUUpdateFailedException(this);
@@ -93,28 +145,77 @@ public class RemotePushIU extends AbstractIU
         setRevision(newRevision);
     }
 
-    // def commit(self):
-    // """Commit to this IU."""
-    // if self.read_only:
-    // raise IUReadOnlyError(self)
-    // if self._committed:
-    // # ignore commit requests when already committed
-    // return
-    // else:
-    // commission_request = iuProtoBuf_pb2.IUCommission()
-    // commission_request.uid = self.uid
-    // commission_request.revision = self.revision
-    // commission_request.writer_name = self.buffer.unique_name
-    // remote_server = self.buffer._get_remote_server(self)
-    // new_revision = remote_server.commit(commission_request)
-    // if new_revision == 0:
-    // raise IUUpdateFailedError(self)
-    // else:
-    // self._revision = new_revision
-    // self._committed = True
+    @Override
+    void putIntoPayload(Map<? extends String, ? extends String> newItems, String writer)
+    {
+        if (isCommitted())
+        {
+            throw new IUCommittedException(this);
+        }
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
+        if (isReadOnly())
+        {
+            throw new IUReadOnlyException(this);
+        }
+        Builder builder = IUPayloadUpdate.newBuilder().setUid(getUid()).setRevision((int) getRevision()).setIsDelta(true)
+                .setWriterName(getBuffer().getUniqueName());
+        for (Map.Entry<? extends String, ? extends String> item : newItems.entrySet())
+        {
+            PayloadItem newItem = PayloadItem.newBuilder().setKey(item.getKey()).setValue(item.getValue()).setType("STR")
+                    .build();
+            builder.addNewItems(newItem);
+
+        }
+        IUPayloadUpdate update = builder.build();
+
+        RemoteServer server = getInputBuffer().getRemoteServer(this);
+        logger.debug("Remote server has methods {}", server.getMethods());
+        long newRevision;
+        try
+        {
+            newRevision = (Long) server.call("updatePayload", update);
+        }
+        catch (RSBException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (ExecutionException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (TimeoutException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (InterruptedException e)
+        {
+            throw new RuntimeException(e);
+        }
+        if (newRevision == 0)
+        {
+            throw new IUUpdateFailedException(this);
+        }
+        System.err.print("************************ ");
+        System.err.println(newRevision);
+        setRevision(newRevision);
+    }
+
+    @Override
+    public void commit()
+    {
+        commit(null);
+    }
+
     @Override
     public void commit(String writerName)
     {
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
         if (isReadOnly())
         {
             throw new IUReadOnlyException(this);
@@ -125,18 +226,30 @@ public class RemotePushIU extends AbstractIU
         }
         else
         {
-            IUCommission iuc = Ipaaca.IUCommission.newBuilder().setUid(getUid()).setRevision(getRevision())
+            IUCommission iuc = Ipaaca.IUCommission.newBuilder().setUid(getUid()).setRevision((int) getRevision())
                     .setWriterName(getBuffer().getUniqueName()).build();
             RemoteServer server = inputBuffer.getRemoteServer(this);
-            int newRevision;
+            long newRevision;
             try
             {
-                newRevision = (Integer) server.call("commit", iuc);
+                newRevision = (Long) server.call("commit", iuc);
             }
             catch (RSBException e)
             {
                 throw new RuntimeException(e);
             }
+            catch (ExecutionException e)
+            {
+                throw new RuntimeException(e);
+            }
+            catch (TimeoutException e)
+            {
+                throw new RuntimeException(e);
+            }
+            catch (InterruptedException e)
+            {
+                throw new RuntimeException(e);
+            }
             if (newRevision == 0)
             {
                 throw new IUCommittedException(this);
@@ -149,17 +262,6 @@ public class RemotePushIU extends AbstractIU
         }
     }
 
-    // def __str__(self):
-    // s = "RemotePushIU{ "
-    // s += "uid="+self._uid+" "
-    // s += "(buffer="+(self.buffer.unique_name if self.buffer is not None else "<None>")+") "
-    // s += "owner_name=" + ("<None>" if self.owner_name is None else self.owner_name) + " "
-    // s += "payload={ "
-    // for k,v in self.payload.items():
-    // s += k+":'"+v+"', "
-    // s += "} "
-    // s += "}"
-    // return s
     @Override
     public String toString()
     {
@@ -178,37 +280,11 @@ public class RemotePushIU extends AbstractIU
         return b.toString();
     }
 
-    //
-    // def _get_payload(self):
-    // return self._payload
     public Payload getPayload()
     {
         return payload;
     }
 
-    // def _set_payload(self, new_pl):
-    // if self.committed:
-    // raise IUCommittedError(self)
-    // if self.read_only:
-    // raise IUReadOnlyError(self)
-    // requested_update = IUPayloadUpdate(
-    // uid=self.uid,
-    // revision=self.revision,
-    // is_delta=False,
-    // writer_name=self.buffer.unique_name,
-    // new_items=new_pl,
-    // keys_to_remove=[])
-    // remote_server = self.buffer._get_remote_server(self)
-    // new_revision = remote_server.updatePayload(requested_update)
-    // if new_revision == 0:
-    // raise IUUpdateFailedError(self)
-    // else:
-    // self._revision = new_revision
-    // self._payload = RemotePushPayload(remote_push_iu=self, new_payload=new_pl)
-    // payload = property(
-    // fget=_get_payload,
-    // fset=_set_payload,
-    // doc='Payload dictionary of the IU.')
     @Override
     public void setPayload(List<PayloadItem> newItems, String writerName)
     {
@@ -216,23 +292,39 @@ public class RemotePushIU extends AbstractIU
         {
             throw new IUCommittedException(this);
         }
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
         if (isReadOnly())
         {
             throw new IUReadOnlyException(this);
         }
 
-        IUPayloadUpdate iuu = IUPayloadUpdate.newBuilder().setRevision(getRevision()).setIsDelta(false).setUid(getUid())
+        IUPayloadUpdate iuu = IUPayloadUpdate.newBuilder().setRevision((int) getRevision()).setIsDelta(false).setUid(getUid())
                 .addAllNewItems(newItems).setWriterName(getBuffer() != null ? getBuffer().getUniqueName() : "").build();
         RemoteServer server = inputBuffer.getRemoteServer(this);
-        int newRevision;
+        long newRevision;
         try
         {
-            newRevision = (Integer) server.call("updatePayload", iuu);
+            newRevision = (Long) server.call("updatePayload", iuu);
         }
         catch (RSBException e)
         {
             throw new RuntimeException(e);
         }
+        catch (ExecutionException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (TimeoutException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (InterruptedException e)
+        {
+            throw new RuntimeException(e);
+        }
         if (newRevision == 0)
         {
             throw new IUUpdateFailedException(this);
@@ -244,37 +336,33 @@ public class RemotePushIU extends AbstractIU
         }
     }
 
-    // def _apply_update(self, update):
-    // """Apply a IUPayloadUpdate to the IU."""
-    // self._revision = update.revision
-    // if update.is_delta:
-    // for k in update.keys_to_remove: self.payload._remotely_enforced_delitem(k)
-    // for k, v in update.new_items.items(): self.payload._remotely_enforced_setitem(k, v)
-    // else:
-    // # using '_payload' to circumvent the local writing methods
-    // self._payload = RemotePushPayload(remote_push_iu=self, new_payload=update.new_items)
     /**
      * Apply a IUPayloadUpdate to the IU.
      * @param update
      */
-    public void applyUpdate(IUPayloadUpdate update)
-    {
-        revision = update.getRevision();
-        if (update.getIsDelta())
-        {
-            for (String key : update.getKeysToRemoveList())
-            {
-                payload.enforcedRemoveItem(key);
-            }
-            for (PayloadItem item : update.getNewItemsList())
-            {
-                payload.enforcedSetItem(item.getKey(), item.getValue());
-            }
-        }
-        else
-        {
-            payload = new Payload(this, update.getNewItemsList());
-        }
+    public void applyUpdate(IUPayloadUpdate update) {
+    	revision = update.getRevision();
+    	if (update.getIsDelta()) {
+    		for (String key : update.getKeysToRemoveList()) {
+    			payload.enforcedRemoveItem(key);
+    		}
+    		for (PayloadItem item : update.getNewItemsList()) {
+    			if (item.getType().equals("STR")) {
+    				payload.enforcedSetItem(item.getKey(), item.getValue());
+    			} else if (item.getType().equals("JSON")) {
+    				String value = item.getValue();
+    				if (value.startsWith("\"")) {
+    					payload.enforcedSetItem(item.getKey(), value.replaceAll("\\\"", ""));
+    				} else if (value.startsWith("{") || value.startsWith("[") || value.matches("true") || value.matches("false") || value.matches("-?[0-9]*[.,]?[0-9][0-9]*.*")) { 
+    					payload.enforcedSetItem(item.getKey(), value);
+    				} else if (value.equals("null")) {
+    					payload.enforcedSetItem(item.getKey(), "");
+    				}
+    			}
+    		}
+    	} else {
+    		payload = new Payload(this, update.getNewItemsList());
+    	}
     }
 
     public void applyLinkUpdate(IULinkUpdate update)
@@ -310,14 +398,16 @@ public class RemotePushIU extends AbstractIU
 
     }
 
-    // def _apply_commission(self):
-    // """Apply commission to the IU"""
-    // self._committed = True
     public void applyCommmision()
     {
         committed = true;
     }
 
+    public void applyRetraction()
+    {
+        retracted = true;
+    }
+
     @Override
     void removeFromPayload(Object key, String writer)
     {
@@ -325,22 +415,38 @@ public class RemotePushIU extends AbstractIU
         {
             throw new IUCommittedException(this);
         }
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
         if (isReadOnly())
         {
             throw new IUReadOnlyException(this);
         }
-        IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setIsDelta(true).setUid(getUid()).setRevision(getRevision())
+        IUPayloadUpdate update = IUPayloadUpdate.newBuilder().setIsDelta(true).setUid(getUid()).setRevision((int) getRevision())
                 .setWriterName(getBuffer().getUniqueName()).addKeysToRemove((String) key).build();
         RemoteServer server = getInputBuffer().getRemoteServer(this);
-        int newRevision;
+        long newRevision;
         try
         {
-            newRevision = (Integer) server.call("updatePayload", update);
+            newRevision = (Long) server.call("updatePayload", update);
         }
         catch (RSBException e)
         {
             throw new RuntimeException(e);
         }
+        catch (ExecutionException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (TimeoutException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (InterruptedException e)
+        {
+            throw new RuntimeException(e);
+        }
         if (newRevision == 0)
         {
             throw new IUUpdateFailedException(this);
@@ -348,25 +454,7 @@ public class RemotePushIU extends AbstractIU
         setRevision(newRevision);
     }
 
-    // def _modify_payload(self, payload, is_delta=True, new_items={}, keys_to_remove=[], writer_name=None):
-    // """Modify the payload: add or remove item from this payload remotely and send update."""
-    // if self.committed:
-    // raise IUCommittedError(self)
-    // if self.read_only:
-    // raise IUReadOnlyError(self)
-    // requested_update = IUPayloadUpdate(
-    // uid=self.uid,
-    // revision=self.revision,
-    // is_delta=is_delta,
-    // writer_name=self.buffer.unique_name,
-    // new_items=new_items,
-    // keys_to_remove=keys_to_remove)
-    // remote_server = self.buffer._get_remote_server(self)
-    // new_revision = remote_server.updatePayload(requested_update)
-    // if new_revision == 0:
-    // raise IUUpdateFailedError(self)
-    // else:
-    // self._revision = new_revision
+
     @Override
     void modifyLinks(boolean isDelta, SetMultimap<String, String> linksToAdd, SetMultimap<String, String> linksToRemove, String writerName)
     {
@@ -374,6 +462,10 @@ public class RemotePushIU extends AbstractIU
         {
             throw new IUCommittedException(this);
         }
+        if (isRetracted())
+        {
+            throw new IURetractedException(this);
+        }
         if (isReadOnly())
         {
             throw new IUReadOnlyException(this);
@@ -391,16 +483,28 @@ public class RemotePushIU extends AbstractIU
         }
 
         IULinkUpdate update = IULinkUpdate.newBuilder().addAllLinksToRemove(removeLinkSet).addAllNewLinks(newLinkSet).setIsDelta(isDelta)
-                .setWriterName(getBuffer() != null ? getBuffer().getUniqueName() : "").setUid(getUid()).setRevision(getRevision()).build();
-        int newRevision;
+                .setWriterName(getBuffer() != null ? getBuffer().getUniqueName() : "").setUid(getUid()).setRevision((int) getRevision()).build();
+        long newRevision;
         try
         {
-            newRevision = (Integer) server.call("updateLinks", update);
+            newRevision = (Long) server.call("updateLinks", update);
         }
         catch (RSBException e)
         {
             throw new RuntimeException(e);
         }
+        catch (ExecutionException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (TimeoutException e)
+        {
+            throw new RuntimeException(e);
+        }
+        catch (InterruptedException e)
+        {
+            throw new RuntimeException(e);
+        }
         if (newRevision == 0)
         {
             throw new IUUpdateFailedException(this);

ipaacalib/java/src/ipaaca/util/Blackboard.java

+package ipaaca.util;
+
+import ipaaca.AbstractIU;
+import ipaaca.HandlerFunctor;
+import ipaaca.IUEventType;
+import ipaaca.InputBuffer;
+import ipaaca.LocalIU;
+import ipaaca.OutputBuffer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * A simple key-value blackboard
+ * @author hvanwelbergen
+ */
+public class Blackboard
+{
+    private final OutputBuffer outBuffer;
+    private final InputBuffer inBuffer;
+    private final LocalIU iu;
+    private final ComponentNotifier notifier;
+    private static final String DUMMY_KEY = "DUMMY_KEY";
+    public static final String MESSAGE_SUFFIX = "MESSAGE";
+    private int dummyValue = 0;
+    private List<BlackboardUpdateListener> listeners = Collections.synchronizedList(new ArrayList<BlackboardUpdateListener>());
+
+    public Blackboard(String id, String category)
+    {
+        this(id, category, "default");
+    }
+
+    private void updateListeners()
+    {
+        synchronized (listeners)
+        {
+            for (BlackboardUpdateListener listener : listeners)
+            {
+                listener.update();
+            }
+        }
+    }
+    public Blackboard(String id, String category, String channel)
+    {
+        outBuffer = new OutputBuffer(id, channel);
+        iu = new LocalIU(category);
+        outBuffer.add(iu);
+        outBuffer.registerHandler(new HandlerFunctor()
+        {
+            @Override
+            public void handle(AbstractIU iu, IUEventType type, boolean local)
+            {
+                updateListeners();
+            }
+        });
+        inBuffer = new InputBuffer(id, ImmutableSet.of(ComponentNotifier.NOTIFY_CATEGORY, category + MESSAGE_SUFFIX), channel);
+        notifier = new ComponentNotifier(id, category, ImmutableSet.of(category), new HashSet<String>(), outBuffer, inBuffer);
+        notifier.addNotificationHandler(new HandlerFunctor()
+        {
+            @Override
+            public void handle(AbstractIU iuNotify, IUEventType type, boolean local)
+            {
+                dummyValue++;
+                iu.getPayload().put(DUMMY_KEY, "" + dummyValue);
+            }
+        });
+        notifier.initialize();
+        inBuffer.registerHandler(new HandlerFunctor()
+        {
+            @Override
+            public void handle(AbstractIU iuMessage, IUEventType type, boolean local)
+            {
+                iu.getPayload().putAll(iuMessage.getPayload());
+                updateListeners();
+            }
+        }, ImmutableSet.of(category + MESSAGE_SUFFIX));
+    }
+
+    public String put(String key, String value)
+    {
+        return iu.getPayload().put(key, value);
+    }
+
+    public void putAll(Map<String, String> newItems)
+    {
+        iu.getPayload().putAll(newItems);
+    }
+
+    /**
+     * Get the value corresponding to the key, or null if it is not available
+     */
+    public String get(String key)
+    {
+        return iu.getPayload().get(key);
+    }
+
+    public void addUpdateListener(BlackboardUpdateListener listener)
+    {
+        listeners.add(listener);
+    }
+
+    public Set<String> keySet()
+    {
+        return iu.getPayload().keySet();
+    }
+
+    public Set<Map.Entry<String, String>> entrySet()
+    {
+        return iu.getPayload().entrySet();
+    }
+
+    public Collection<String> values()
+    {
+        return iu.getPayload().values();
+    }
+
+    public void close()
+    {
+        outBuffer.close();
+        inBuffer.close();
+    }
+}

ipaacalib/java/src/ipaaca/util/BlackboardClient.java

+package ipaaca.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableSet;
+
+import ipaaca.AbstractIU;
+import ipaaca.HandlerFunctor;
+import ipaaca.IUEventType;
+import ipaaca.InputBuffer;
+import ipaaca.LocalMessageIU;
+import ipaaca.OutputBuffer;
+
+/**
+ * Client to get/set key value pairs on a Blackboard
+ * @author hvanwelbergen
+ *
+ */
+public class BlackboardClient
+{
+    private final InputBuffer inBuffer;
+    private final OutputBuffer outBuffer;
+    private List<BlackboardUpdateListener> listeners = Collections.synchronizedList(new ArrayList<BlackboardUpdateListener>());
+    private final String category;
+    
+    public BlackboardClient(String id, String category)
+    {
+        this(id, category, "default");
+    }
+
+    public BlackboardClient(String id, String category, String channel)
+    {
+        this.category = category;
+        inBuffer = new InputBuffer(id, ImmutableSet.of(category, ComponentNotifier.NOTIFY_CATEGORY), channel);
+        inBuffer.setResendActive(true);
+        inBuffer.registerHandler(new HandlerFunctor()
+        {
+            @Override
+            public void handle(AbstractIU iu, IUEventType type, boolean local)
+            {
+                synchronized (listeners)
+                {
+                    for (BlackboardUpdateListener listener : listeners)
+                    {
+                        listener.update();
+                    }
+                }
+            }
+        }, ImmutableSet.of(category));
+        outBuffer = new OutputBuffer(id);
+        ComponentNotifier notifier = new ComponentNotifier(id, category, new HashSet<String>(), ImmutableSet.of(category),
+                outBuffer, inBuffer);
+        notifier.initialize();
+    }
+
+    public void close()
+    {
+        inBuffer.close();
+        outBuffer.close();
+    }
+    
+    public void waitForBlackboardConnection()
+    {
+        while(inBuffer.getIUs().isEmpty());        
+    }
+    
+    public String get(String key)
+    {
+        if (inBuffer.getIUs().isEmpty())
+        {
+            return null;
+        }
+        return inBuffer.getIUs().iterator().next().getPayload().get(key);
+    }
+
+    public void put(String key, String value)
+    {
+        LocalMessageIU iu = new LocalMessageIU(category+Blackboard.MESSAGE_SUFFIX);
+        iu.getPayload().put(key,value);
+        outBuffer.add(iu);
+    }
+    
+    public void putAll(Map<String,String> values)
+    {
+        LocalMessageIU iu = new LocalMessageIU(category+Blackboard.MESSAGE_SUFFIX);
+        iu.getPayload().putAll(values);
+        outBuffer.add(iu);
+    }
+    
+    private boolean hasIU()
+    {
+        return !inBuffer.getIUs().isEmpty();
+    }
+    
+    private AbstractIU getIU()
+    {
+        return inBuffer.getIUs().iterator().next();
+    }
+    
+    public Set<String> keySet()
+    {
+        if(!hasIU())return new HashSet<>();
+        return getIU().getPayload().keySet();
+    }
+
+    public Set<Map.Entry<String, String>> entrySet()
+    {
+        if(!hasIU())return new HashSet<>();
+        return getIU().getPayload().entrySet();
+    }
+
+    public Collection<String> values()
+    {
+        if(!hasIU())return new HashSet<>();
+        return getIU().getPayload().values();
+    }
+    
+    public void addUpdateListener(BlackboardUpdateListener listener)
+    {
+        listeners.add(listener);
+    }
+}