Commit a6bb9daa authored by Andre Freyssinet's avatar Andre Freyssinet

Fix JORAM-291: Renames deleteJMSPBrideConnection and deprecates old

names.
parent 74f50570
......@@ -844,8 +844,50 @@ public interface AdminItf {
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*/
public String deleteJMSBridgeConnection(int serverId, String names) throws ConnectException, AdminException;
/**
* Removes the live connection to the specified JMS server (Use deleteJMSBridgeConnection instead).
*
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*
* @deprecated Use deleteJMSBridgeConnection instead.
*/
public String deleteJMSPBridgeConnection(int serverId, String names) throws ConnectException, AdminException;
/**
* Removes the live connection to the specified JMS server.
*
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @param async invoke asynchronously
* @return the result of the method
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*/
public String deleteJMSBridgeConnection(int serverId, String names, boolean async) throws ConnectException, AdminException;
/**
* Removes the live connection to the specified JMS server (Use deleteJMSBridgeConnection instead).
*
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @param async invoke asynchronously
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*
* @deprecated Use deleteJMSBridgeConnection instead.
*/
public String deleteJMSPBridgeConnection(int serverId, String names, boolean async) throws ConnectException, AdminException;
}
......@@ -1705,9 +1705,45 @@ public final class AdminModule {
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*/
public static String deleteJMSBridgeConnection(int serverId, String names) throws ConnectException, AdminException {
if (wrapper == null)
throw new ConnectException("Administration connection is closed.");
return wrapper.deleteJMSBridgeConnection(serverId, names);
}
/**
* Removes the live connection to the specified AMQP server.
*
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @param async invoke asynchronously
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*/
public static String deleteJMSBridgeConnection(int serverId, String names, boolean async) throws ConnectException, AdminException {
if (wrapper == null)
throw new ConnectException("Administration connection is closed.");
return wrapper.deleteJMSBridgeConnection(serverId, names, async);
}
/**
* Removes the live connection to the specified AMQP server.
*
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*
* @deprecated
*/
public static String deleteJMSPBridgeConnection(int serverId, String names) throws ConnectException, AdminException {
if (wrapper == null)
throw new ConnectException("Administration connection is closed.");
......@@ -1721,8 +1757,11 @@ public final class AdminModule {
* @param names the name identifying the server or list of name separate by space
* @param async invoke asynchronously
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*
* @deprecated
*/
public static String deleteJMSPBridgeConnection(int serverId, String names, boolean async) throws ConnectException, AdminException {
if (wrapper == null)
......
......@@ -1295,10 +1295,11 @@ public class AdminWrapper implements AdminItf {
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*/
public String deleteJMSPBridgeConnection(int serverId, String names) throws ConnectException, AdminException {
public String deleteJMSBridgeConnection(int serverId, String names) throws ConnectException, AdminException {
return invokeStaticServerMethod(
serverId,
"org.objectweb.joram.mom.dest.jms.JMSConnectionService",
......@@ -1307,6 +1308,22 @@ public class AdminWrapper implements AdminItf {
new Object[] { names });
}
/**
* Removes the live connection to the specified JMS server (Use deleteJMSBridgeConnection instead).
*
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*
* @deprecated Use deleteJMSBridgeConnection instead.
*/
public String deleteJMSPBridgeConnection(int serverId, String names) throws ConnectException, AdminException {
return deleteJMSBridgeConnection(serverId, names);
}
/**
* Removes the live connection to the specified JMS server.
*
......@@ -1317,7 +1334,7 @@ public class AdminWrapper implements AdminItf {
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*/
public String deleteJMSPBridgeConnection(int serverId, String names, boolean async) throws ConnectException, AdminException {
public String deleteJMSBridgeConnection(int serverId, String names, boolean async) throws ConnectException, AdminException {
return invokeStaticServerMethod(
serverId,
"org.objectweb.joram.mom.dest.jms.JMSConnectionService",
......@@ -1325,4 +1342,21 @@ public class AdminWrapper implements AdminItf {
new Class[] { String.class },
new Object[] { names }, async);
}
/**
* Removes the live connection to the specified JMS server (Use deleteJMSBridgeConnection instead).
*
* @param serverId the serverId
* @param names the name identifying the server or list of name separate by space
* @param async invoke asynchronously
* @return the result of the method
*
* @throws ConnectException If the connection fails.
* @throws AdminException If the invocation can't be done or fails
*
* @deprecated Use deleteJMSBridgeConnection instead.
*/
public String deleteJMSPBridgeConnection(int serverId, String names, boolean async) throws ConnectException, AdminException {
return deleteJMSBridgeConnection(serverId, names, async);
}
}
......@@ -982,26 +982,45 @@ public class JoramAdmin implements AdminItf, JoramAdminMBean {
return wrapper.invokeStaticServerMethod(serverId, className, methodName, parameterTypes, args, async);
}
@Override
public String addAMQPBridgeConnection(int serverId, String urls)
throws ConnectException, AdminException {
return wrapper.addAMQPBridgeConnection(serverId, urls);
}
@Override
public String deleteAMQPBridgeConnection(int serverId, String names)
throws ConnectException, AdminException {
return wrapper.deleteAMQPBridgeConnection(serverId, names);
}
@Override
public String addJMSBridgeConnection(int serverId, String urls)
throws ConnectException, AdminException {
return wrapper.addJMSBridgeConnection(serverId, urls);
}
@Override
public String deleteJMSBridgeConnection(int serverId, String names)
throws ConnectException, AdminException {
return wrapper.deleteJMSBridgeConnection(serverId, names);
}
@Override
public String deleteJMSBridgeConnection(int serverId, String names, boolean async)
throws ConnectException, AdminException {
return wrapper.deleteJMSBridgeConnection(serverId, names, async);
}
/** @deprecated */
@Override
public String deleteJMSPBridgeConnection(int serverId, String names)
throws ConnectException, AdminException {
return wrapper.deleteJMSPBridgeConnection(serverId, names);
}
/** @deprecated */
@Override
public String deleteJMSPBridgeConnection(int serverId, String names, boolean async)
throws ConnectException, AdminException {
return wrapper.deleteJMSPBridgeConnection(serverId, names, async);
......
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