Commit 79f5a868 authored by Guillaume Surrel's avatar Guillaume Surrel
Browse files

Merge user agent with proxy implementation.

parent f253f6a6
......@@ -1859,7 +1859,7 @@ public final class AdminTopic extends Topic implements AdminTopicMBean {
}
// ================================================================================
// This code is used by the ProxyImpl to handle destination creation through the
// This code is used by the UserAgent to handle destination creation through the
// JMS Session.
// ================================================================================
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2003 - 2009 ScalAgent Distributed Technologies
* Copyright (C) 2003 - 2010 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -479,7 +479,7 @@ class ClientSubscription implements ClientSubscriptionMBean, Serializable {
* to the subscriber.
*/
// AF: TODO we should parse each message for each subscription
// see ProxyImpl.doFwd
// see UserAgent.doFwd
void browseNewMessages(List newMessages) {
if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, this + ".browseNewMessages(" + newMessages + ')');
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2003 - ScalAgent Distributed Technologies
* Copyright (C) 2003 - 2010 ScalAgent Distributed Technologies
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
......@@ -22,35 +22,23 @@
*/
package org.objectweb.joram.mom.proxies;
import org.objectweb.joram.shared.client.AbstractJmsReply;
import fr.dyade.aaa.agent.AgentId;
import fr.dyade.aaa.agent.Notification;
/**
* The <code>ProxyAgentItf</code> interface defines the methods which must be
* provided by a proxy agent hosting a <code>ProxyImpl</code> instance.
* provided by a user agent instance.
*/
public interface ProxyAgentItf {
/** Returns the proxy's <code>AgentId</code> identifier. */
public AgentId getId();
/** Sends a notification to a given agent. */
public void sendNot(AgentId to, Notification not);
/**
* Sends an <code>AbstractJmsReply</code> to a given client.
*
* @param id Identifies the context within which the sending occurs.
* @param reply The reply to send to the client.
*/
public void sendToClient(int id, AbstractJmsReply reply);
public void setNoSave();
public void setSave();
public String getName();
public String getMBeanName();
}
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2001 - 2006 ScalAgent Distributed Technologies
* Copyright (C) 2001 - 2010 ScalAgent Distributed Technologies
* Copyright (C) 1996 - 2000 Dyade
*
* This library is free software; you can redistribute it and/or
......@@ -53,14 +53,11 @@ public class ReliableConnectionContext implements ConnectionContext, Serializabl
private int heartBeat;
private ProxyImpl proxyImpl;
private boolean closed;
ReliableConnectionContext(ProxyImpl proxyImpl, int key, int heartBeat) {
ReliableConnectionContext(int key, int heartBeat) {
this.key = key;
this.heartBeat = heartBeat;
this.proxyImpl = proxyImpl;
inputCounter = -1;
outputCounter = 0;
queue = new AckedQueue();
......
/*
* JORAM: Java(TM) Open Reliable Asynchronous Messaging
* Copyright (C) 2001 - 2006 ScalAgent Distributed Technologies
* Copyright (C) 2001 - 2010 ScalAgent Distributed Technologies
* Copyright (C) 1996 - 2000 Dyade
*
* This library is free software; you can redistribute it and/or
......@@ -24,11 +24,11 @@
*/
package org.objectweb.joram.mom.proxies;
import org.objectweb.joram.shared.excepts.MomException;
import org.objectweb.joram.shared.client.AbstractJmsReply;
import org.objectweb.joram.shared.client.AbstractJmsRequest;
import org.objectweb.joram.shared.client.MomExceptionReply;
import org.objectweb.joram.shared.client.CnxCloseRequest;
import org.objectweb.joram.shared.client.MomExceptionReply;
import org.objectweb.joram.shared.excepts.MomException;
import fr.dyade.aaa.common.Queue;
......@@ -47,13 +47,10 @@ public class StandardConnectionContext
private Queue queue;
private ProxyImpl proxyImpl;
private boolean closed;
StandardConnectionContext(ProxyImpl proxyImpl, int key) {
StandardConnectionContext(int key) {
this.key = key;
this.proxyImpl = proxyImpl;
queue = new Queue();
closed = false;
}
......
......@@ -23,7 +23,7 @@
package org.objectweb.joram.mom.proxies;
public interface ProxyImplMBean {
public interface UserAgentMBean {
/**
* Returns the name of this queue, or its id if not set.
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment