Commit 86fb24d2 authored by Andre Freyssinet's avatar Andre Freyssinet
Browse files

Renames org.ow2.joram.client in org.ow2.joram.jakarta.

parent 9de28c09
......@@ -21,7 +21,7 @@
* Initial developer(s): Frederic Maistre (INRIA)
* Contributor(s):ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
......
......@@ -21,7 +21,7 @@
* Initial developer(s): ScalAgent Distributed Technologies
* Contributor(s): Abdenbi Benammour
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.util.HashMap;
import java.util.List;
......@@ -50,9 +50,9 @@ import org.objectweb.joram.shared.client.ConsumerSubRequest;
import org.objectweb.joram.shared.security.Identity;
import org.objectweb.util.monolog.api.BasicLevel;
import org.objectweb.util.monolog.api.Logger;
import org.ow2.joram.client.jms.connection.RequestChannel;
import org.ow2.joram.client.jms.connection.RequestMultiplexer;
import org.ow2.joram.client.jms.connection.Requestor;
import org.ow2.joram.jakarta.jms.connection.RequestChannel;
import org.ow2.joram.jakarta.jms.connection.RequestMultiplexer;
import org.ow2.joram.jakarta.jms.connection.Requestor;
import fr.dyade.aaa.common.Configuration;
import fr.dyade.aaa.common.Debug;
......@@ -220,7 +220,7 @@ public class Connection implements jakarta.jms.Connection, ConnectionMBean {
}
// This property allows to customize the JMS MessageID adding the specified string.
public final String MESSAGE_ID_PREFIX_PROPERTY = "org.ow2.joram.client.jms.messageid.prefix";
public final String MESSAGE_ID_PREFIX_PROPERTY = "org.ow2.joram.jakarta.jms.messageid.prefix";
/**
* Open the <code>Connection</code>.
......
......@@ -23,9 +23,9 @@
* Contributor(s): ScalAgent Distributed Technologies
* Benoit Pelletier (Bull SA)
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import org.ow2.joram.client.jms.admin.AbstractConnectionFactory;
import org.ow2.joram.jakarta.jms.admin.AbstractConnectionFactory;
/**
* Implements all the <code>jakarta.jms.ConnectionFactory</code> interfaces.
......
......@@ -20,7 +20,7 @@
* Initial developer(s): ScalAgent Distributed Technologies
* Contributor(s):
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import jakarta.jms.JMSException;
......
......@@ -21,7 +21,7 @@
* Initial developer(s): Frederic Maistre (INRIA)
* Contributor(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.util.Enumeration;
import java.util.Vector;
......
......@@ -22,7 +22,7 @@
* Initial developer(s): Frederic Maistre (INRIA)
* Contributor(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.net.ConnectException;
import java.util.Enumeration;
......@@ -60,12 +60,12 @@ import org.objectweb.joram.shared.admin.UnsetReader;
import org.objectweb.joram.shared.admin.UnsetWriter;
import org.objectweb.util.monolog.api.BasicLevel;
import org.objectweb.util.monolog.api.Logger;
import org.ow2.joram.client.jms.admin.AdminException;
import org.ow2.joram.client.jms.admin.AdminItf;
import org.ow2.joram.client.jms.admin.AdminModule;
import org.ow2.joram.client.jms.admin.AdministeredObject;
import org.ow2.joram.client.jms.admin.User;
import org.ow2.joram.client.jms.admin.XmlSerializer;
import org.ow2.joram.jakarta.jms.admin.AdminException;
import org.ow2.joram.jakarta.jms.admin.AdminItf;
import org.ow2.joram.jakarta.jms.admin.AdminModule;
import org.ow2.joram.jakarta.jms.admin.AdministeredObject;
import org.ow2.joram.jakarta.jms.admin.User;
import org.ow2.joram.jakarta.jms.admin.XmlSerializer;
import fr.dyade.aaa.common.Debug;
import fr.dyade.aaa.util.management.MXWrapper;
......@@ -576,7 +576,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @exception ConnectException If the administration connection is closed or broken.
* @exception AdminException If the request fails.
*
* @see org.ow2.joram.client.jms.DestinationMBean#addReader(java.lang.String)
* @see org.ow2.joram.jakarta.jms.DestinationMBean#addReader(java.lang.String)
*/
public void addReader(String proxyId) throws ConnectException, AdminException {
doRequest(new SetReader(proxyId, getName()));
......@@ -606,7 +606,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @exception ConnectException If the administration connection is closed or broken.
* @exception AdminException If the request fails.
*
* @see org.ow2.joram.client.jms.DestinationMBean#addWriter(java.lang.String)
* @see org.ow2.joram.jakarta.jms.DestinationMBean#addWriter(java.lang.String)
*/
public void addWriter(String proxyId) throws ConnectException, AdminException {
doRequest(new SetWriter(proxyId, getName()));
......@@ -636,7 +636,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @exception ConnectException If the administration connection is closed or broken.
* @exception AdminException If the request fails.
*
* @see org.ow2.joram.client.jms.DestinationMBean#removeReader(java.lang.String)
* @see org.ow2.joram.jakarta.jms.DestinationMBean#removeReader(java.lang.String)
*/
public void removeReader(String proxyId) throws ConnectException, AdminException {
doRequest(new UnsetReader(proxyId, getName()));
......@@ -666,7 +666,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @exception ConnectException If the administration connection is closed or broken.
* @exception AdminException If the request fails.
*
* @see org.ow2.joram.client.jms.DestinationMBean#removeWriter(java.lang.String)
* @see org.ow2.joram.jakarta.jms.DestinationMBean#removeWriter(java.lang.String)
*/
public void removeWriter(String proxyId) throws ConnectException, AdminException {
doRequest(new UnsetWriter(proxyId, getName()));
......@@ -708,7 +708,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @exception ConnectException If the administration connection is closed or broken.
* @exception AdminException If the request fails.
*
* @see org.ow2.joram.client.jms.DestinationMBean#getReaderList()
* @see org.ow2.joram.jakarta.jms.DestinationMBean#getReaderList()
*/
public List getReaderList() throws ConnectException, AdminException {
GetRightsRequest request = new GetRightsRequest(getName());
......@@ -760,7 +760,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @exception ConnectException If the administration connection is closed or broken.
* @exception AdminException If the request fails.
*
* @see org.ow2.joram.client.jms.DestinationMBean#getWriterList()
* @see org.ow2.joram.jakarta.jms.DestinationMBean#getWriterList()
*/
public List getWriterList() throws ConnectException, AdminException {
GetRightsRequest request = new GetRightsRequest(getName());
......@@ -802,7 +802,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @exception ConnectException If the administration connection is closed or broken.
* @exception AdminException If the request fails.
*
* @see org.ow2.joram.client.jms.DestinationMBean#setFreelyReadable(boolean)
* @see org.ow2.joram.jakarta.jms.DestinationMBean#setFreelyReadable(boolean)
*/
public void setFreelyReadable(boolean readable) throws ConnectException, AdminException {
if (readable)
......@@ -837,7 +837,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @exception ConnectException If the administration connection is closed or broken.
* @exception AdminException If the request fails.
*
* @see org.ow2.joram.client.jms.DestinationMBean#setFreelyWriteable(boolean)
* @see org.ow2.joram.jakarta.jms.DestinationMBean#setFreelyWriteable(boolean)
*/
public void setFreelyWriteable(boolean writeable) throws ConnectException, AdminException {
if (writeable)
......@@ -956,7 +956,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
/**
* Return a set of statistic values from the destination.
*
* @see org.ow2.joram.client.jms.DestinationMBean#getStatistic()
* @see org.ow2.joram.jakarta.jms.DestinationMBean#getStatistic()
* @deprecated
*/
public Hashtable getStatistic() throws ConnectException, AdminException {
......@@ -969,7 +969,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @return a Hashtable containing the values of all valid JMX attributes about the destination.
* The keys are the name of corresponding attributes.
*
* @see org.ow2.joram.client.jms.DestinationMBean#getStatistics()
* @see org.ow2.joram.jakarta.jms.DestinationMBean#getStatistics()
*/
public Hashtable getStatistics() throws ConnectException, AdminException {
GetStatsRequest request = new GetStatsRequest(getName());
......@@ -984,7 +984,7 @@ public abstract class Destination extends AdministeredObject implements jakarta.
* @return a Hashtable containing the values of the specified JMX attributes about
* the destination. The keys are the name of corresponding attributes.
*
* @see org.ow2.joram.client.jms.DestinationMBean#getStatistics()
* @see org.ow2.joram.jakarta.jms.DestinationMBean#getStatistics()
*/
public Hashtable getStatistics(String attributes) throws ConnectException, AdminException {
GetStatsRequest request = new GetStatsRequest(getName(), attributes);
......
......@@ -20,17 +20,18 @@
* Initial developer(s): ScalAgent Distributed Technologies
* Contributor(s):
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.net.ConnectException;
import java.util.List;
import org.ow2.joram.jakarta.jms.admin.AdminException;
import java.util.Hashtable;
import jakarta.jms.InvalidDestinationException;
import jakarta.jms.JMSException;
import org.ow2.joram.client.jms.admin.AdminException;
public interface DestinationMBean {
public String getName();
public String getAdminName();
......
......@@ -22,7 +22,7 @@
* Contributor(s): ScalAgent Distributed Technologies
* Benoit Pelletier (Bull SA)
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.util.ArrayList;
import java.util.Enumeration;
......@@ -270,7 +270,7 @@ public class FactoryParameters implements java.io.Serializable, Cloneable {
/**
* This attribute allows to customize the JMS MessageID adding the specified string.
* This value is overloaded by the property org.ow2.joram.client.jms.messageid.prefix if it defined.
* This value is overloaded by the property org.ow2.joram.jakarta.jms.messageid.prefix if it defined.
* By default empty.
*/
public String messageIdPrefix = null;
......
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import jakarta.jms.JMSException;
import jakarta.jms.JMSRuntimeException;
......
......@@ -20,7 +20,7 @@
* Initial developer(s):
* Contributor(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.io.Serializable;
......@@ -601,7 +601,7 @@ public class JMSContext implements jakarta.jms.JMSContext {
public JMSProducer createProducer() {
connection.lockClientID();
try {
return new org.ow2.joram.client.jms.JMSProducer(session);
return new org.ow2.joram.jakarta.jms.JMSProducer(session);
} catch (JMSException e) {
throw new JMSRuntimeException("Unable to create producer "
+ e.getMessage());
......@@ -825,7 +825,7 @@ public class JMSContext implements jakarta.jms.JMSContext {
class ContextConnection {
private int counter = 0;
private boolean autoStart = true;
private org.ow2.joram.client.jms.Connection connection = null;
private org.ow2.joram.jakarta.jms.Connection connection = null;
private boolean lockClientID = false;
void lockClientID() {
......@@ -833,7 +833,7 @@ class ContextConnection {
}
ContextConnection(Connection connection) {
this.connection = (org.ow2.joram.client.jms.Connection) connection;
this.connection = (org.ow2.joram.jakarta.jms.Connection) connection;
}
public synchronized Session createSession() throws JMSException {
......
......@@ -20,7 +20,7 @@
* Initial developer(s):
* Contributor(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.io.Serializable;
import java.util.HashMap;
......
......@@ -21,7 +21,7 @@
* Initial developer(s): Frederic Maistre (INRIA)
* Contributor(s):ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
......
......@@ -20,7 +20,7 @@
* Initial developer(s): ScalAgent Distributed Technologies
* Contributor(s):
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.util.Enumeration;
import java.util.Hashtable;
......@@ -35,7 +35,7 @@ import org.objectweb.joram.shared.excepts.MessageValueException;
import org.objectweb.joram.shared.messages.ConversionHelper;
import org.objectweb.util.monolog.api.BasicLevel;
import org.objectweb.util.monolog.api.Logger;
import org.ow2.joram.client.jms.admin.AdminMessage;
import org.ow2.joram.jakarta.jms.admin.AdminMessage;
import fr.dyade.aaa.common.Debug;
......@@ -198,7 +198,7 @@ public class Message implements jakarta.jms.Message {
*/
public void acknowledge() throws JMSException {
if (session.getAcknowledgeMode() == Session.INDIVIDUAL_ACKNOWLEDGE)
session.acknowledge((org.ow2.joram.client.jms.Destination)getJMSDestination(), getJMSMessageID());
session.acknowledge((org.ow2.joram.jakarta.jms.Destination)getJMSDestination(), getJMSMessageID());
if ((session == null) ||
session.getTransacted() ||
......@@ -347,8 +347,8 @@ public class Message implements jakarta.jms.Message {
public final void setJMSDestination(jakarta.jms.Destination dest) throws JMSException {
jmsDest = dest;
if ((dest != null) &&
(dest instanceof org.ow2.joram.client.jms.Destination)) {
Destination d = (org.ow2.joram.client.jms.Destination) dest;
(dest instanceof org.ow2.joram.jakarta.jms.Destination)) {
Destination d = (org.ow2.joram.jakarta.jms.Destination) dest;
momMsg.setDestination(d.getName(), d.getAdminName(), d.getType());
return;
}
......@@ -459,8 +459,8 @@ public class Message implements jakarta.jms.Message {
*/
public final void setJMSReplyTo(jakarta.jms.Destination replyTo) throws JMSException {
if ((replyTo != null) &&
(replyTo instanceof org.ow2.joram.client.jms.Destination)) {
Destination d = (org.ow2.joram.client.jms.Destination) replyTo;
(replyTo instanceof org.ow2.joram.jakarta.jms.Destination)) {
Destination d = (org.ow2.joram.jakarta.jms.Destination) replyTo;
momMsg.setReplyTo(d.getName(), d.getAdminName(), d.getType());
return;
}
......
......@@ -21,7 +21,7 @@
* Initial developer(s): Frederic Maistre (INRIA)
* Contributor(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.util.Vector;
......
......@@ -21,7 +21,7 @@
* Initial developer(s): Frederic Maistre (INRIA)
* Contributor(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import jakarta.jms.IllegalStateException;
import jakarta.jms.InvalidDestinationException;
......
......@@ -20,7 +20,7 @@
*
* Initial developer(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.util.ArrayList;
import java.util.Vector;
......@@ -41,9 +41,9 @@ import fr.dyade.aaa.common.StoppedQueueException;
import org.objectweb.util.monolog.api.BasicLevel;
import org.objectweb.util.monolog.api.Logger;
import org.ow2.joram.client.jms.connection.AbortedRequestException;
import org.ow2.joram.client.jms.connection.ReplyListener;
import org.ow2.joram.client.jms.connection.RequestMultiplexer;
import org.ow2.joram.jakarta.jms.connection.AbortedRequestException;
import org.ow2.joram.jakarta.jms.connection.ReplyListener;
import org.ow2.joram.jakarta.jms.connection.RequestMultiplexer;
/**
* This class listens to replies asynchronously returned by the user proxy
......
......@@ -20,7 +20,7 @@
* Initial developer(s): Abdenbi Benammour
* Contributor(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import jakarta.jms.Message;
import jakarta.jms.Session;
......
......@@ -21,7 +21,7 @@
* Initial developer(s): Frederic Maistre (INRIA)
* Contributor(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import jakarta.jms.IllegalStateException;
import jakarta.jms.InvalidDestinationException;
......
......@@ -20,7 +20,7 @@
*
* Initial developer(s): ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.util.Vector;
......@@ -32,7 +32,7 @@ import jakarta.jms.ServerSessionPool;
import org.objectweb.joram.shared.client.ConsumerMessages;
import org.objectweb.util.monolog.api.BasicLevel;
import org.objectweb.util.monolog.api.Logger;
import org.ow2.joram.client.jms.connection.RequestMultiplexer;
import org.ow2.joram.jakarta.jms.connection.RequestMultiplexer;
import fr.dyade.aaa.common.Daemon;
import fr.dyade.aaa.common.Debug;
......@@ -108,7 +108,7 @@ public class MultiSessionConsumer extends MessageConsumerListener implements jak
}
/* (non-Javadoc)
* @see org.ow2.joram.client.jms.MessageConsumerListener#pushMessages(org.objectweb.joram.shared.client.ConsumerMessages)
* @see org.ow2.joram.jakarta.jms.MessageConsumerListener#pushMessages(org.objectweb.joram.shared.client.ConsumerMessages)
*/
public void pushMessages(ConsumerMessages cm) throws JMSException {
if (logger.isLoggable(BasicLevel.DEBUG))
......
......@@ -21,7 +21,7 @@
* Initial developer(s): Frederic Maistre (INRIA)
* Contributor(s):ScalAgent Distributed Technologies
*/
package org.ow2.joram.client.jms;
package org.ow2.joram.jakarta.jms;
import java.io.Serializable;
......
Supports Markdown
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