[jboss-cvs] JBoss Messaging SVN: r6648 - in trunk: src/main/org/jboss/messaging/core/client/impl and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat May 2 09:35:54 EDT 2009
Author: timfox
Date: 2009-05-02 09:35:53 -0400 (Sat, 02 May 2009)
New Revision: 6648
Added:
trunk/src/main/org/jboss/messaging/utils/json/
trunk/src/main/org/jboss/messaging/utils/json/JSONArray.java
trunk/src/main/org/jboss/messaging/utils/json/JSONException.java
trunk/src/main/org/jboss/messaging/utils/json/JSONObject.java
trunk/src/main/org/jboss/messaging/utils/json/JSONString.java
trunk/src/main/org/jboss/messaging/utils/json/JSONTokener.java
Modified:
trunk/src/main/org/jboss/messaging/core/buffers/AbstractChannelBuffer.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java
trunk/src/main/org/jboss/messaging/core/management/ManagementService.java
trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java
trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
trunk/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
trunk/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java
trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
trunk/src/main/org/jboss/messaging/jms/server/management/JMSServerControlMBean.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementHelper.java
trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java
trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java
trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSMessagingProxy.java
trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/CoreMessagingProxy.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementHelperTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
Log:
refactored management to use JSON
Modified: trunk/src/main/org/jboss/messaging/core/buffers/AbstractChannelBuffer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/buffers/AbstractChannelBuffer.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/core/buffers/AbstractChannelBuffer.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -29,6 +29,7 @@
import java.nio.channels.GatheringByteChannel;
import java.nio.channels.ScatteringByteChannel;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
import org.jboss.messaging.utils.DataConstants;
import org.jboss.messaging.utils.SimpleString;
@@ -44,7 +45,9 @@
*/
public abstract class AbstractChannelBuffer implements ChannelBuffer
{
+ private static final Logger log = Logger.getLogger(AbstractChannelBuffer.class);
+
private int readerIndex;
private int writerIndex;
@@ -671,6 +674,7 @@
public String readString()
{
int len = readInt();
+
char[] chars = new char[len];
for (int i = 0; i < len; i++)
{
@@ -741,7 +745,7 @@
* @see org.jboss.messaging.core.remoting.spi.MessagingBuffer#writeNullableString(java.lang.String)
*/
public void writeNullableString(final String val)
- {
+ {
if (val == null)
{
writeByte(DataConstants.NULL);
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -251,8 +251,7 @@
throw new MessagingException(MessagingException.ILLEGAL_STATE,
"Header size (" + headerSize + ") is too big, use the messageBody for large data, or increase minLargeMessageSize");
}
-
-
+
// msg.getBody() could be Null on LargeServerMessage
if (msg.getBodyInputStream() == null && msg.getBody() != null)
{
Modified: trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -21,41 +21,40 @@
package org.jboss.messaging.core.client.management.impl;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
import org.jboss.messaging.utils.SimpleString;
+import org.jboss.messaging.utils.json.JSONArray;
+import org.jboss.messaging.utils.json.JSONObject;
/*
+ *
+ * Operation params and results are encoded as JSON arrays
+ *
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
* @version <tt>$Revision$</tt>
*/
public class ManagementHelper
{
-
// Constants -----------------------------------------------------
+
+ private static final Logger log = Logger.getLogger(ManagementHelper.class);
+
public static final SimpleString HDR_RESOURCE_NAME = new SimpleString("_JBM_ResourceName");
public static final SimpleString HDR_ATTRIBUTE = new SimpleString("_JBM_Attribute");
- public static final SimpleString HDR_OPERATION_PREFIX = new SimpleString("_JBM_Operation$");
+ public static final SimpleString HDR_OPERATION_NAME = new SimpleString("_JBM_OperationName");
- public static final SimpleString HDR_OPERATION_NAME = new SimpleString(HDR_OPERATION_PREFIX + "name");
-
public static final SimpleString HDR_OPERATION_SUCCEEDED = new SimpleString("_JBM_OperationSucceeded");
- public static final SimpleString HDR_OPERATION_EXCEPTION = new SimpleString("_JBM_OperationException");
-
public static final SimpleString HDR_NOTIFICATION_TYPE = new SimpleString("_JBM_NotifType");
public static final SimpleString HDR_NOTIFICATION_TIMESTAMP = new SimpleString("_JBM_NotifTimestamp");
@@ -74,8 +73,6 @@
public static final SimpleString HDR_DISTANCE = new SimpleString("_JBM_Distance");
- private static final SimpleString NULL = new SimpleString("_JBM_NULL");
-
public static final SimpleString HDR_CONSUMER_COUNT = new SimpleString("_JBM_ConsumerCount");
public static final SimpleString HDR_USER = new SimpleString("_JBM_User");
@@ -94,217 +91,229 @@
public static void putOperationInvocation(final Message message,
final String resourceName,
+ final String operationName) throws Exception
+ {
+ putOperationInvocation(message, resourceName, operationName, (Object[])null);
+ }
+
+ public static void putOperationInvocation(final Message message,
+ final String resourceName,
final String operationName,
- final Object... parameters)
+ final Object... parameters) throws Exception
{
- // store the name of the operation...
+ // store the name of the operation in the headers
message.putStringProperty(HDR_RESOURCE_NAME, new SimpleString(resourceName));
message.putStringProperty(HDR_OPERATION_NAME, new SimpleString(operationName));
- // ... and all the parameters (preserving their types)
- for (int i = 0; i < parameters.length; i++)
+
+ // and the params go in the body, since might be too large for header
+
+ String paramString;
+
+ if (parameters != null)
{
- Object parameter = parameters[i];
- // use a zero-filled 2-padded index:
- // if there is more than 10 parameters, order is preserved (e.g. 02 will be before 10)
- SimpleString key = new SimpleString(String.format("%s%02d", HDR_OPERATION_PREFIX, i));
- storeTypedProperty(message, key, parameter);
+ JSONArray jsonArray = toJSONArray(parameters);
+
+ paramString = jsonArray.toString();
}
+ else
+ {
+ paramString = null;
+ }
+
+ message.getBody().writeNullableString(paramString);
}
- public static List<Object> retrieveOperationParameters(final Message message)
+ private static JSONArray toJSONArray(final Object[] array) throws Exception
{
- List<Object> params = new ArrayList<Object>();
- Set<SimpleString> propertyNames = message.getPropertyNames();
- // put the property names in a list to sort them and have the parameters
- // in the correct order
- List<SimpleString> propsNames = new ArrayList<SimpleString>(propertyNames);
- Collections.sort(propsNames);
- for (SimpleString propertyName : propsNames)
+ JSONArray jsonArray = new JSONArray();
+
+ for (int i = 0; i < array.length; i++)
{
- if (propertyName.startsWith(ManagementHelper.HDR_OPERATION_PREFIX))
+ Object parameter = array[i];
+
+ if (parameter instanceof Map)
{
- String s = propertyName.toString();
- // split by the dot
- String[] ss = s.split("\\$");
- try
+ Map<String, Object> map = (Map<String, Object>)parameter;
+
+ JSONObject jsonObject = new JSONObject();
+
+ for (Map.Entry<String, Object> entry : map.entrySet())
{
- int index = Integer.parseInt(ss[ss.length - 1]);
- Object value = message.getProperty(propertyName);
- if (value instanceof SimpleString)
- {
- value = value.toString();
- }
- if (NULL.toString().equals(value))
- {
- value = null;
- }
- else if (value.toString().startsWith("L["))
- {
- String str = value.toString().substring(2);
- String[] strings = str.split("\\|\\|");
- value = strings;
- }
- params.add(index, value);
+ String key = entry.getKey();
+
+ Object val = entry.getValue();
+
+ checkType(val);
+
+ jsonObject.put(key, val);
}
- catch (NumberFormatException e)
+
+ jsonArray.put(jsonObject);
+ }
+ else
+ {
+ Class clz = parameter.getClass();
+
+ if (clz.isArray())
{
- // ignore the property (it is the operation name)
+ Object[] innerArray = (Object[])parameter;
+
+ jsonArray.put(toJSONArray(innerArray));
}
+ else
+ {
+ checkType(parameter);
+
+ jsonArray.put(parameter);
+ }
}
}
- return params;
+
+ return jsonArray;
}
- public static boolean isOperationResult(final Message message)
+ private static Object[] fromJSONArray(final JSONArray jsonArray) throws Exception
{
- return message.containsProperty(HDR_OPERATION_SUCCEEDED);
+ Object[] array = new Object[jsonArray.length()];
+
+ for (int i = 0; i < jsonArray.length(); i++)
+ {
+ Object val = jsonArray.get(i);
+
+ if (val instanceof JSONArray)
+ {
+ Object[] inner = fromJSONArray((JSONArray)val);
+
+ array[i] = inner;
+ }
+ else if (val instanceof JSONObject)
+ {
+ JSONObject jsonObject = (JSONObject)val;
+
+ Map<String, Object> map = new HashMap<String, Object>();
+
+ Iterator<String> iter = jsonObject.keys();
+
+ while (iter.hasNext())
+ {
+ String key = iter.next();
+
+ Object innerVal = jsonObject.get(key);
+
+ map.put(key, innerVal);
+ }
+
+ array[i] = map;
+ }
+ else
+ {
+ array[i] = val;
+ }
+ }
+
+ return array;
}
- public static boolean isAttributesResult(final Message message)
+ private static void checkType(final Object param)
{
- return !(isOperationResult(message));
+ if (param instanceof Integer == false && param instanceof Long == false &&
+ param instanceof Double == false &&
+ param instanceof String == false &&
+ param instanceof Boolean == false)
+ {
+ throw new IllegalArgumentException("Params for management operations must be of the following type: " + "int long double String boolean Map or array thereof");
+ }
}
- public static void storeResult(final Message message, final Object result)
+ public static Object[] retrieveOperationParameters(final Message message) throws Exception
{
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try
+ String jsonString = message.getBody().readNullableString();
+
+ if (jsonString != null)
{
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(result);
+ JSONArray jsonArray = new JSONArray(jsonString);
+
+ return fromJSONArray(jsonArray);
}
- catch (IOException e)
+ else
{
- throw new IllegalStateException(result + " can not be written to a byte array");
+ return null;
}
- byte[] data = baos.toByteArray();
- message.getBody().writeInt(data.length);
- message.getBody().writeBytes(data);
}
- public static Object getResult(final Message message)
+ public static boolean isOperationResult(final Message message)
{
- int len = message.getBody().readInt();
- byte[] data = new byte[len];
- message.getBody().readBytes(data);
- return from(data);
+ return message.containsProperty(HDR_OPERATION_SUCCEEDED);
}
- public static boolean hasOperationSucceeded(final Message message)
+ public static boolean isAttributesResult(final Message message)
{
- if (!isOperationResult(message))
- {
- return false;
- }
- if (message.containsProperty(HDR_OPERATION_SUCCEEDED))
- {
- return (Boolean)message.getProperty(HDR_OPERATION_SUCCEEDED);
- }
- return false;
+ return !(isOperationResult(message));
}
- public static String getOperationExceptionMessage(final Message message)
+ public static void storeResult(final Message message, final Object result) throws Exception
{
- if (message.containsProperty(HDR_OPERATION_EXCEPTION))
- {
- return ((SimpleString)message.getProperty(HDR_OPERATION_EXCEPTION)).toString();
- }
- return null;
- }
+ String resultString;
- public static void storeTypedProperty(final Message message, final SimpleString key, final Object typedProperty)
- {
- if (typedProperty == null)
+ if (result != null)
{
- message.putStringProperty(key, NULL);
- return;
- }
-
- checkSimpleType(typedProperty);
+ // Result is stored in body, also encoded as JSON array of length 1
- if (typedProperty instanceof Void)
- {
- // do not put the returned value if the operation was a procedure
+ JSONArray jsonArray = toJSONArray(new Object[] { result });
+
+ resultString = jsonArray.toString();
}
- else if (typedProperty instanceof Boolean)
+ else
{
- message.putBooleanProperty(key, (Boolean)typedProperty);
+ resultString = null;
}
- else if (typedProperty instanceof Byte)
+
+ message.getBody().writeNullableString(resultString);
+ }
+
+ public static Object[] getResults(final Message message) throws Exception
+ {
+ String jsonString = message.getBody().readNullableString();
+
+ if (jsonString != null)
{
- message.putByteProperty(key, (Byte)typedProperty);
+ JSONArray jsonArray = new JSONArray(jsonString);
+
+ Object[] res = fromJSONArray(jsonArray);
+
+ return res;
}
- else if (typedProperty instanceof Short)
- {
- message.putShortProperty(key, (Short)typedProperty);
- }
- else if (typedProperty instanceof Integer)
- {
- message.putIntProperty(key, (Integer)typedProperty);
- }
- else if (typedProperty instanceof Long)
- {
- message.putLongProperty(key, (Long)typedProperty);
- }
- else if (typedProperty instanceof Float)
- {
- message.putFloatProperty(key, (Float)typedProperty);
- }
- else if (typedProperty instanceof Double)
- {
- message.putDoubleProperty(key, (Double)typedProperty);
- }
- else if (typedProperty instanceof String)
- {
- message.putStringProperty(key, new SimpleString((String)typedProperty));
- }
- else if (typedProperty instanceof String[])
- {
- String str = "L[";
- String[] strings = (String[])typedProperty;
- for (String string : strings)
- {
- str += string + "||";
- }
- message.putStringProperty(key, new SimpleString(str));
- }
- // serialize as a SimpleString
else
{
- message.putStringProperty(key, new SimpleString("" + typedProperty));
+ return null;
}
}
- private static void checkSimpleType(Object o)
+ public static Object getResult(final Message message) throws Exception
{
- if (!((o instanceof Void) || (o instanceof Boolean) ||
- (o instanceof Byte) ||
- (o instanceof Short) ||
- (o instanceof Integer) ||
- (o instanceof Long) ||
- (o instanceof Float) ||
- (o instanceof Double) ||
- (o instanceof String) ||
- (o instanceof String[]) ||
- (o instanceof SimpleString)))
+ Object[] res = getResults(message);
+
+ if (res != null)
{
- throw new IllegalStateException("Can not store object as a message property: " + o);
+ return res[0];
}
+ else
+ {
+ return null;
+ }
}
-
- public static Object from(final byte[] bytes)
+
+ public static boolean hasOperationSucceeded(final Message message)
{
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- ObjectInputStream ois;
- try
+ if (!isOperationResult(message))
{
- ois = new ObjectInputStream(bais);
- return ois.readObject();
+ return false;
}
- catch (Exception e)
+ if (message.containsProperty(HDR_OPERATION_SUCCEEDED))
{
- throw new IllegalStateException(e);
+ return (Boolean)message.getProperty(HDR_OPERATION_SUCCEEDED);
}
+ return false;
}
// Constructors --------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/management/ManagementService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/ManagementService.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/core/management/ManagementService.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -132,5 +132,5 @@
Object getResource(String resourceName);
- ServerMessage handleMessage(ServerMessage message);
+ ServerMessage handleMessage(ServerMessage message) throws Exception;
}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -357,42 +357,65 @@
unregisterFromRegistry(ResourceNames.CORE_CLUSTER_CONNECTION + name);
}
- public ServerMessage handleMessage(final ServerMessage message)
+ public ServerMessage handleMessage(final ServerMessage message) throws Exception
{
// a reply message is sent with the result stored in the message body.
// we set its type to MessageImpl.OBJECT_TYPE so that I can be received
// as an ObjectMessage when using JMS to send management message
- ServerMessageImpl reply = new ServerMessageImpl(message);
- reply.setType(MessageImpl.OBJECT_TYPE);
+ ServerMessageImpl reply = new ServerMessageImpl(storageManager.generateUniqueID());
+ reply.setBody(ChannelBuffers.dynamicBuffer(1024));
SimpleString resourceName = (SimpleString)message.getProperty(ManagementHelper.HDR_RESOURCE_NAME);
if (log.isDebugEnabled())
{
log.debug("handling management message for " + resourceName);
}
- Set<SimpleString> propertyNames = message.getPropertyNames();
- // use an array with all the property names to avoid a
- // ConcurrentModificationException
- // when invoking an operation or retrieving attributes (since they add
- // properties to the message)
- List<SimpleString> propNames = new ArrayList<SimpleString>(propertyNames);
- if (propNames.contains(ManagementHelper.HDR_OPERATION_NAME))
- {
- SimpleString operation = (SimpleString)message.getProperty(ManagementHelper.HDR_OPERATION_NAME);
- List<Object> operationParameters = ManagementHelper.retrieveOperationParameters(message);
-
- if (operation != null)
+ SimpleString operation = (SimpleString)message.getProperty(ManagementHelper.HDR_OPERATION_NAME);
+
+ if (operation != null)
+ {
+ Object[] params = ManagementHelper.retrieveOperationParameters(message);
+
+ try
{
+ Object result = invokeOperation(resourceName.toString(), operation.toString(), params);
+
+ log.info("Result is " + result);
+
+ ManagementHelper.storeResult(reply, result);
+
+ reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, true);
+ }
+ catch (Exception e)
+ {
+ log.warn("exception while invoking " + operation + " on " + resourceName, e);
+ reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, false);
+ String exceptionMessage = e.getMessage();
+ if (e instanceof InvocationTargetException)
+ {
+ exceptionMessage = ((InvocationTargetException)e).getTargetException().getMessage();
+ }
+ if (e != null)
+ {
+ ManagementHelper.storeResult(message, exceptionMessage);
+ }
+ }
+ }
+ else
+ {
+ SimpleString attribute = (SimpleString)message.getProperty(ManagementHelper.HDR_ATTRIBUTE);
+
+ if (attribute != null)
+ {
try
{
- Object result = invokeOperation(resourceName.toString(), operation.toString(), operationParameters);
- reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, true);
+ Object result = getAttribute(resourceName.toString(), attribute.toString());
ManagementHelper.storeResult(reply, result);
}
catch (Exception e)
{
- log.warn("exception while invoking " + operation + " on " + resourceName, e);
+ log.warn("exception while retrieving attribute " + attribute + " on " + resourceName, e);
reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, false);
String exceptionMessage = e.getMessage();
if (e instanceof InvocationTargetException)
@@ -401,42 +424,11 @@
}
if (e != null)
{
- reply.putStringProperty(ManagementHelper.HDR_OPERATION_EXCEPTION,
- new SimpleString(exceptionMessage));
+ ManagementHelper.storeResult(message, exceptionMessage);
}
- }
+ }
}
}
- else
- {
- for (SimpleString propertyName : propNames)
- {
- if (propertyName.equals(ManagementHelper.HDR_ATTRIBUTE))
- {
- SimpleString attribute = (SimpleString)message.getProperty(propertyName);
- try
- {
- Object result = getAttribute(resourceName.toString(), attribute.toString());
- ManagementHelper.storeResult(reply, result);
- }
- catch (Exception e)
- {
- log.warn("exception while retrieving attribute " + attribute + " on " + resourceName, e);
- reply.putBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED, false);
- String exceptionMessage = e.getMessage();
- if (e instanceof InvocationTargetException)
- {
- exceptionMessage = ((InvocationTargetException)e).getTargetException().getMessage();
- }
- if (e != null)
- {
- reply.putStringProperty(ManagementHelper.HDR_OPERATION_EXCEPTION,
- new SimpleString(exceptionMessage));
- }
- }
- }
- }
- }
return reply;
}
@@ -685,7 +677,7 @@
}
}
- private Object invokeOperation(final String resourceName, final String operation, final List<Object> params) throws Exception
+ private Object invokeOperation(final String resourceName, final String operation, final Object[] params) throws Exception
{
Object resource = registry.get(resourceName);
@@ -699,19 +691,18 @@
Method[] methods = resource.getClass().getMethods();
for (Method m : methods)
{
- if (m.getName().equals(operation) && m.getParameterTypes().length == params.size())
+ if (m.getName().equals(operation) && m.getParameterTypes().length == params.length)
{
method = m;
}
}
if (method == null)
{
- throw new IllegalArgumentException("no operation " + operation + "/" + params.size());
+ throw new IllegalArgumentException("no operation " + operation + "/" + params.length);
}
- Object[] p = params.toArray(new Object[params.size()]);
+ Object result = method.invoke(resource, params);
- Object result = method.invoke(resource, p);
return result;
}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ReplicationOperationInvokerImpl.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -105,7 +105,7 @@
}
else
{
- throw new Exception(ManagementHelper.getOperationExceptionMessage(reply));
+ throw new Exception((String)ManagementHelper.getResult(reply));
}
}
Modified: trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/core/message/impl/MessageImpl.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -74,9 +74,7 @@
public static final SimpleString HDR_FROM_CLUSTER = new SimpleString("_JBM_FROM_CLUSTER");
public static final SimpleString HDR_LAST_VALUE_NAME = new SimpleString("_JBM_LVQ_NAME");
-
- public static final byte OBJECT_TYPE = 2;
-
+
// Attributes ----------------------------------------------------
protected long messageID;
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossBytesMessage.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -22,8 +22,6 @@
package org.jboss.messaging.jms.client;
-import java.nio.BufferUnderflowException;
-
import javax.jms.BytesMessage;
import javax.jms.JMSException;
import javax.jms.MessageEOFException;
@@ -31,7 +29,6 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.impl.LargeMessageBufferImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnection.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -22,15 +22,8 @@
package org.jboss.messaging.jms.client;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.core.exception.MessagingException;
-import org.jboss.messaging.core.logging.Logger;
-import org.jboss.messaging.core.remoting.FailureListener;
-import org.jboss.messaging.core.version.Version;
-import org.jboss.messaging.utils.SimpleString;
-import org.jboss.messaging.utils.UUIDGenerator;
-import org.jboss.messaging.utils.VersionLoader;
+import java.util.HashSet;
+import java.util.Set;
import javax.jms.Connection;
import javax.jms.ConnectionConsumer;
@@ -53,9 +46,17 @@
import javax.jms.XASession;
import javax.jms.XATopicConnection;
import javax.jms.XATopicSession;
-import java.util.HashSet;
-import java.util.Set;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.ClientSessionFactory;
+import org.jboss.messaging.core.exception.MessagingException;
+import org.jboss.messaging.core.logging.Logger;
+import org.jboss.messaging.core.remoting.FailureListener;
+import org.jboss.messaging.core.version.Version;
+import org.jboss.messaging.utils.SimpleString;
+import org.jboss.messaging.utils.UUIDGenerator;
+import org.jboss.messaging.utils.VersionLoader;
+
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossMessage.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -118,17 +118,17 @@
switch (type)
{
- case JBossMessage.TYPE:
+ case JBossMessage.TYPE: //0
{
msg = new JBossMessage(message, session);
break;
}
- case JBossBytesMessage.TYPE:
+ case JBossBytesMessage.TYPE: //4
{
msg = new JBossBytesMessage(message, session);
break;
}
- case JBossMapMessage.TYPE:
+ case JBossMapMessage.TYPE: //5
{
msg = new JBossMapMessage(message, session);
break;
@@ -138,12 +138,12 @@
msg = new JBossObjectMessage(message, session);
break;
}
- case JBossStreamMessage.TYPE:
+ case JBossStreamMessage.TYPE: //6
{
msg = new JBossStreamMessage(message, session);
break;
}
- case JBossTextMessage.TYPE:
+ case JBossTextMessage.TYPE: //3
{
msg = new JBossTextMessage(message, session);
break;
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossObjectMessage.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -33,7 +33,6 @@
import org.jboss.messaging.core.client.ClientMessage;
import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.message.impl.MessageImpl;
/**
* This class implements javax.jms.ObjectMessage
@@ -54,7 +53,7 @@
{
// Constants -----------------------------------------------------
- public static final byte TYPE = MessageImpl.OBJECT_TYPE;
+ public static final byte TYPE = 2;
// Attributes ----------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/server/JMSServerManager.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -35,6 +35,7 @@
*
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*/
public interface JMSServerManager extends MessagingComponent
{
Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerManagerImpl.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -124,11 +124,8 @@
return;
}
- log.info("context is " + context);
-
if (context == null)
{
- log.info("creating initial context");
context = new InitialContext();
}
@@ -184,8 +181,7 @@
// JMSServerManager implementation -------------------------------
public synchronized void setContext(final Context context)
- {
- log.info("setting context with " + context);
+ {
this.context = context;
}
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/JMSServerControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/JMSServerControlMBean.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/JMSServerControlMBean.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -25,15 +25,14 @@
import static javax.management.MBeanOperationInfo.ACTION;
import static javax.management.MBeanOperationInfo.INFO;
-import java.util.List;
+import java.util.Map;
-import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.management.Operation;
import org.jboss.messaging.core.management.Parameter;
-import org.jboss.messaging.utils.Pair;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
* @version <tt>$Revision$</tt>
*
@@ -67,38 +66,26 @@
String name) throws Exception;
void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- List<String> jndiBindings) throws Exception;
+ String[] liveConnectorsTransportClassNames,
+ Map<String, Object>[] liveConnectorTransportParams,
+ String[] backupConnectorsTransportClassNames,
+ Map<String, Object>[] backupConnectorTransportParams,
+ String[] jndiBindings) throws Exception;
void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- TransportConfiguration backupTC,
- List<String> jndiBindings) throws Exception;
-
- void createConnectionFactory(String name, TransportConfiguration liveTC, List<String> jndiBindings) throws Exception;
-
- void createConnectionFactory(String name,
- String discoveryAddress,
- int discoveryPort,
+ String[] liveConnectorsTransportClassNames,
+ Map<String, Object>[] liveConnectorTransportParams,
+ String[] backupConnectorsTransportClassNames,
+ Map<String, Object>[] backupConnectorTransportParams,
String clientID,
- List<String> jndiBindings) throws Exception;
+ String[] jndiBindings) throws Exception;
void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
+ String[] liveConnectorsTransportClassNames,
+ Map<String, Object>[] liveConnectorTransportParams,
+ String[] backupConnectorsTransportClassNames,
+ Map<String, Object>[] backupConnectorTransportParams,
String clientID,
- List<String> jndiBindings) throws Exception;
-
- void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- TransportConfiguration backupTC,
- String clientID,
- List<String> jndiBindings) throws Exception;
-
- void createConnectionFactory(String name, TransportConfiguration liveTC, String clientID, List<String> jndiBindings) throws Exception;
-
- void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- String clientID,
long pingPeriod,
long connectionTTL,
long callTimeout,
@@ -123,12 +110,18 @@
double retryIntervalMultiplier,
int reconnectAttempts,
boolean failoverOnServerShutdown,
- List<String> jndiBindings) throws Exception;
+ String[] jndiBindings) throws Exception;
void createConnectionFactory(String name,
String discoveryAddress,
int discoveryPort,
String clientID,
+ String[] jndiBindings) throws Exception;
+
+ void createConnectionFactory(String name,
+ String discoveryAddress,
+ int discoveryPort,
+ String clientID,
long discoveryRefreshTimeout,
long pingPeriod,
long connectionTTL,
@@ -155,8 +148,34 @@
double retryIntervalMultiplier,
int reconnectAttempts,
boolean failoverOnServerShutdown,
- List<String> jndiBindings) throws Exception;
+ String[] jndiBindings) throws Exception;
+ void createConnectionFactory(String name,
+ String liveTransportClassName,
+ Map<String, Object> liveTransportParams,
+ String[] jndiBindings) throws Exception;
+
+ void createConnectionFactory(String name,
+ String liveTransportClassName,
+ Map<String, Object> liveTransportParams,
+ String clientID,
+ String[] jndiBindings) throws Exception;
+
+ void createConnectionFactory(String name,
+ String liveTransportClassName,
+ Map<String, Object> liveTransportParams,
+ String backupTransportClassName,
+ Map<String, Object> backupTransportParams,
+ String[] jndiBindings) throws Exception;
+
+ void createConnectionFactory(String name,
+ String liveTransportClassName,
+ Map<String, Object> liveTransportParams,
+ String backupTransportClassName,
+ Map<String, Object> backupTransportParams,
+ String clientID,
+ String[] jndiBindings) throws Exception;
+
@Operation(desc = "Create a JMS ConnectionFactory", impact = ACTION)
void destroyConnectionFactory(@Parameter(name = "name", desc = "Name of the ConnectionFactory to create")
String name) throws Exception;
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementHelper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementHelper.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSManagementHelper.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -21,18 +21,16 @@
package org.jboss.messaging.jms.server.management.impl;
-import static org.jboss.messaging.core.client.management.impl.ManagementHelper.HDR_ATTRIBUTE;
-import static org.jboss.messaging.core.client.management.impl.ManagementHelper.HDR_OPERATION_EXCEPTION;
-import static org.jboss.messaging.core.client.management.impl.ManagementHelper.HDR_OPERATION_NAME;
-import static org.jboss.messaging.core.client.management.impl.ManagementHelper.HDR_OPERATION_PREFIX;
-import static org.jboss.messaging.core.client.management.impl.ManagementHelper.HDR_OPERATION_SUCCEEDED;
-import static org.jboss.messaging.core.client.management.impl.ManagementHelper.HDR_RESOURCE_NAME;
-
import javax.jms.JMSException;
import javax.jms.Message;
+import org.jboss.messaging.core.client.management.impl.ManagementHelper;
+import org.jboss.messaging.jms.client.JBossMessage;
+import org.jboss.messaging.utils.json.JSONArray;
+
/*
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
* @version <tt>$Revision$</tt>
*/
@@ -44,17 +42,43 @@
// Static --------------------------------------------------------
+ private static org.jboss.messaging.core.message.Message getCoreMessage(final Message jmsMessage)
+ {
+ if (jmsMessage instanceof JBossMessage == false)
+ {
+ throw new IllegalArgumentException("Cannot send a non JBoss message as a management message " +
+ jmsMessage.getClass().getName());
+ }
+
+ return ((JBossMessage)jmsMessage).getCoreMessage();
+ }
+
public static void putAttribute(final Message message, final String resourceName, final String attribute) throws JMSException
{
- message.setStringProperty(HDR_RESOURCE_NAME.toString(), resourceName);
- message.setStringProperty(HDR_ATTRIBUTE.toString(), attribute);
+ ManagementHelper.putAttribute(getCoreMessage(message), resourceName, attribute);
}
public static void putOperationInvocation(final Message message,
final String resourceName,
final String operationName) throws JMSException
+ {
+ try
+ {
+ ManagementHelper.putOperationInvocation(getCoreMessage(message), resourceName, operationName);
+ }
+ catch (Exception e)
+ {
+ throw convertFromException(e);
+ }
+ }
+
+ private static JMSException convertFromException(Exception e)
{
- putOperationInvocation(message, resourceName, operationName, (Object[])null);
+ JMSException jmse = new JMSException(e.getMessage());
+
+ jmse.initCause(e);
+
+ return jmse;
}
public static void putOperationInvocation(final Message message,
@@ -62,108 +86,39 @@
final String operationName,
final Object... parameters) throws JMSException
{
- // store the name of the operation...
- message.setStringProperty(HDR_RESOURCE_NAME.toString(), resourceName);
- message.setStringProperty(HDR_OPERATION_NAME.toString(), operationName);
- // ... and all the parameters (preserving their types)
- if (parameters != null)
+ try
{
- for (int i = 0; i < parameters.length; i++)
- {
- Object parameter = parameters[i];
- // use a zero-filled 2-padded index:
- // if there is more than 10 parameters, order is preserved (e.g. 02 will be before 10)
- String key = String.format("%s%02d", HDR_OPERATION_PREFIX, i);
- storeTypedProperty(message, key, parameter);
- }
+ ManagementHelper.putOperationInvocation(getCoreMessage(message), resourceName, operationName, parameters);
}
+ catch (Exception e)
+ {
+ throw convertFromException(e);
+ }
}
public static boolean isOperationResult(final Message message) throws JMSException
{
- return message.propertyExists(HDR_OPERATION_SUCCEEDED.toString());
+ return ManagementHelper.isOperationResult(getCoreMessage(message));
}
public static boolean isAttributesResult(final Message message) throws JMSException
{
- return !(isOperationResult(message));
+ return ManagementHelper.isAttributesResult(getCoreMessage(message));
}
public static boolean hasOperationSucceeded(final Message message) throws JMSException
{
- if (!isOperationResult(message))
- {
- return false;
- }
- if (message.propertyExists(HDR_OPERATION_SUCCEEDED.toString()))
- {
- return message.getBooleanProperty(HDR_OPERATION_SUCCEEDED.toString());
- }
- return false;
+ return ManagementHelper.hasOperationSucceeded(getCoreMessage(message));
}
-
- public static String getOperationExceptionMessage(final Message message) throws JMSException
+
+ public static Object[] getResults(final Message message) throws Exception
{
- if (message.propertyExists(HDR_OPERATION_EXCEPTION.toString()))
- {
- return message.getStringProperty(HDR_OPERATION_EXCEPTION.toString());
- }
- return null;
+ return ManagementHelper.getResults(getCoreMessage(message));
}
- public static void storeTypedProperty(final Message message, final String key, final Object typedProperty) throws JMSException
+ public static Object getResult(final Message message) throws Exception
{
- if (typedProperty instanceof Void)
- {
- // do not put the returned value if the operation was a procedure
- }
- else if (typedProperty instanceof Boolean)
- {
- message.setBooleanProperty(key, (Boolean)typedProperty);
- }
- else if (typedProperty instanceof Byte)
- {
- message.setByteProperty(key, (Byte)typedProperty);
- }
- else if (typedProperty instanceof Short)
- {
- message.setShortProperty(key, (Short)typedProperty);
- }
- else if (typedProperty instanceof Integer)
- {
- message.setIntProperty(key, (Integer)typedProperty);
- }
- else if (typedProperty instanceof Long)
- {
- message.setLongProperty(key, (Long)typedProperty);
- }
- else if (typedProperty instanceof Float)
- {
- message.setFloatProperty(key, (Float)typedProperty);
- }
- else if (typedProperty instanceof Double)
- {
- message.setDoubleProperty(key, (Double)typedProperty);
- }
- else if (typedProperty instanceof String)
- {
- message.setStringProperty(key, (String)typedProperty);
- }
- else if (typedProperty instanceof String[])
- {
- String str = "L[";
- String[] strings = (String[])typedProperty;
- for (String string : strings)
- {
- str += string + "||";
- }
- message.setStringProperty(key, str);
- }
- // serialize as a SimpleString
- else
- {
- message.setStringProperty(key, typedProperty.toString());
- }
+ return ManagementHelper.getResult(getCoreMessage(message));
}
// Constructors --------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/impl/JMSServerControl.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -22,7 +22,10 @@
package org.jboss.messaging.jms.server.management.impl;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
import javax.management.ListenerNotFoundException;
@@ -44,6 +47,7 @@
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
* @version <tt>$Revision$</tt>
*
@@ -57,9 +61,9 @@
private final JMSServerManager server;
- private NotificationBroadcasterSupport broadcaster;
+ private final NotificationBroadcasterSupport broadcaster;
- private AtomicLong notifSeq = new AtomicLong(0);
+ private final AtomicLong notifSeq = new AtomicLong(0);
// Static --------------------------------------------------------
@@ -76,145 +80,286 @@
// JMSServerControlMBean implementation --------------------------
- public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String[] liveConnectorsTransportClassNames,
+ final Map<String, Object>[] liveConnectorTransportParams,
+ final String[] backupConnectorsTransportClassNames,
+ final Map<String, Object>[] backupConnectorTransportParams,
+ final String[] jndiBindings) throws Exception
{
- server.createConnectionFactory(name, connectorConfigs, jndiBindings);
-
- sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
+ List<Pair<TransportConfiguration, TransportConfiguration>> pairs = convertToConnectorPairs(liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams);
+
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name, pairs, jndiBindingsList);
+
+ sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
- public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- String clientID,
- List<String> jndiBindings) throws Exception
+ private List<Pair<TransportConfiguration, TransportConfiguration>> convertToConnectorPairs(final String[] liveConnectorsTransportClassNames,
+ final Map<String, Object>[] liveConnectorTransportParams,
+ final String[] backupConnectorsTransportClassNames,
+ final Map<String, Object>[] backupConnectorTransportParams)
{
- server.createConnectionFactory(name, connectorConfigs, clientID, jndiBindings);
-
+ List<Pair<TransportConfiguration, TransportConfiguration>> pairs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>();
+
+ for (int i = 0; i < liveConnectorsTransportClassNames.length; i++)
+ {
+ TransportConfiguration tcLive = new TransportConfiguration(liveConnectorsTransportClassNames[i],
+ liveConnectorTransportParams[i]);
+ TransportConfiguration tcBackup = new TransportConfiguration(liveConnectorsTransportClassNames[i],
+ liveConnectorTransportParams[i]);
+ Pair<TransportConfiguration, TransportConfiguration> pair = new Pair<TransportConfiguration, TransportConfiguration>(tcLive,
+ tcBackup);
+
+ pairs.add(pair);
+ }
+
+ return pairs;
+ }
+
+ public void createConnectionFactory(final String name,
+ final String[] liveConnectorsTransportClassNames,
+ final Map<String, Object>[] liveConnectorTransportParams,
+ final String[] backupConnectorsTransportClassNames,
+ final Map<String, Object>[] backupConnectorTransportParams,
+ final String clientID,
+ final String[] jndiBindings) throws Exception
+ {
+ List<Pair<TransportConfiguration, TransportConfiguration>> pairs = convertToConnectorPairs(liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams);
+
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name, pairs, clientID, jndiBindingsList);
+
sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
- public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- String clientID,
- long pingPeriod,
- long connectionTTL,
- long callTimeout,
- int maxConnections,
- int minLargeMessageSize,
- int consumerWindowSize,
- int consumerMaxRate,
- int producerWindowSize,
- int producerMaxRate,
- boolean blockOnAcknowledge,
- boolean blockOnPersistentSend,
- boolean blockOnNonPersistentSend,
- boolean autoGroup,
- boolean preAcknowledge,
- String loadBalancingPolicyClassName,
- int transactionBatchSize,
- int dupsOKBatchSize,
- boolean useGlobalPools,
- int scheduledThreadPoolMaxSize,
- int threadPoolMaxSize,
- long retryInterval,
- double retryIntervalMultiplier,
- int reconnectAttempts,
- boolean failoverOnServerShutdown,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String[] liveConnectorsTransportClassNames,
+ final Map<String, Object>[] liveConnectorTransportParams,
+ final String[] backupConnectorsTransportClassNames,
+ final Map<String, Object>[] backupConnectorTransportParams,
+ final String clientID,
+ final long pingPeriod,
+ final long connectionTTL,
+ final long callTimeout,
+ final int maxConnections,
+ final int minLargeMessageSize,
+ final int consumerWindowSize,
+ final int consumerMaxRate,
+ final int producerWindowSize,
+ final int producerMaxRate,
+ final boolean blockOnAcknowledge,
+ final boolean blockOnPersistentSend,
+ final boolean blockOnNonPersistentSend,
+ final boolean autoGroup,
+ final boolean preAcknowledge,
+ final String loadBalancingPolicyClassName,
+ final int transactionBatchSize,
+ final int dupsOKBatchSize,
+ final boolean useGlobalPools,
+ final int scheduledThreadPoolMaxSize,
+ final int threadPoolMaxSize,
+ final long retryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean failoverOnServerShutdown,
+ final String[] jndiBindings) throws Exception
{
- server.createConnectionFactory(name, connectorConfigs, clientID, pingPeriod, connectionTTL, callTimeout, maxConnections, minLargeMessageSize, consumerWindowSize, consumerMaxRate, producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, blockOnNonPersistentSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, transactionBatchSize, dupsOKBatchSize, useGlobalPools, scheduledThreadPoolMaxSize, threadPoolMaxSize, retryInterval, retryIntervalMultiplier, reconnectAttempts, failoverOnServerShutdown, jndiBindings);
-
+ List<Pair<TransportConfiguration, TransportConfiguration>> pairs = convertToConnectorPairs(liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams);
+
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name,
+ pairs,
+ clientID,
+ pingPeriod,
+ connectionTTL,
+ callTimeout,
+ maxConnections,
+ minLargeMessageSize,
+ consumerWindowSize,
+ consumerMaxRate,
+ producerWindowSize,
+ producerMaxRate,
+ blockOnAcknowledge,
+ blockOnPersistentSend,
+ blockOnNonPersistentSend,
+ autoGroup,
+ preAcknowledge,
+ loadBalancingPolicyClassName,
+ transactionBatchSize,
+ dupsOKBatchSize,
+ useGlobalPools,
+ scheduledThreadPoolMaxSize,
+ threadPoolMaxSize,
+ retryInterval,
+ retryIntervalMultiplier,
+ reconnectAttempts,
+ failoverOnServerShutdown,
+ jndiBindingsList);
+
sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
- public void createConnectionFactory(String name,
- String discoveryAddress,
- int discoveryPort,
- String clientID,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String discoveryAddress,
+ final int discoveryPort,
+ final String clientID,
+ final String[] jndiBindings) throws Exception
{
- server.createConnectionFactory(name, discoveryAddress, discoveryPort, clientID, jndiBindings);
-
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name, discoveryAddress, discoveryPort, clientID, jndiBindingsList);
+
sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
- public void createConnectionFactory(String name,
- String discoveryAddress,
- int discoveryPort,
- String clientID,
- long discoveryRefreshTimeout,
- long pingPeriod,
- long connectionTTL,
- long callTimeout,
- int maxConnections,
- int minLargeMessageSize,
- int consumerWindowSize,
- int consumerMaxRate,
- int producerWindowSize,
- int producerMaxRate,
- boolean blockOnAcknowledge,
- boolean blockOnPersistentSend,
- boolean blockOnNonPersistentSend,
- boolean autoGroup,
- boolean preAcknowledge,
- String loadBalancingPolicyClassName,
- int transactionBatchSize,
- int dupsOKBatchSize,
- long initialWaitTimeout,
- boolean useGlobalPools,
- int scheduledThreadPoolMaxSize,
- int threadPoolMaxSize,
- long retryInterval,
- double retryIntervalMultiplier,
- int reconnectAttempts,
- boolean failoverOnServerShutdown,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String discoveryAddress,
+ final int discoveryPort,
+ final String clientID,
+ final long discoveryRefreshTimeout,
+ final long pingPeriod,
+ final long connectionTTL,
+ final long callTimeout,
+ final int maxConnections,
+ final int minLargeMessageSize,
+ final int consumerWindowSize,
+ final int consumerMaxRate,
+ final int producerWindowSize,
+ final int producerMaxRate,
+ final boolean blockOnAcknowledge,
+ final boolean blockOnPersistentSend,
+ final boolean blockOnNonPersistentSend,
+ final boolean autoGroup,
+ final boolean preAcknowledge,
+ final String loadBalancingPolicyClassName,
+ final int transactionBatchSize,
+ final int dupsOKBatchSize,
+ final long initialWaitTimeout,
+ final boolean useGlobalPools,
+ final int scheduledThreadPoolMaxSize,
+ final int threadPoolMaxSize,
+ final long retryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean failoverOnServerShutdown,
+ final String[] jndiBindings) throws Exception
{
- server.createConnectionFactory(name, discoveryAddress, discoveryPort, clientID, discoveryRefreshTimeout, pingPeriod, connectionTTL, callTimeout, maxConnections, minLargeMessageSize, consumerWindowSize, consumerMaxRate, producerWindowSize, producerMaxRate, blockOnAcknowledge, blockOnPersistentSend, blockOnNonPersistentSend, autoGroup, preAcknowledge, loadBalancingPolicyClassName, transactionBatchSize, dupsOKBatchSize, initialWaitTimeout, useGlobalPools, scheduledThreadPoolMaxSize, threadPoolMaxSize, retryInterval, retryIntervalMultiplier, reconnectAttempts, failoverOnServerShutdown, jndiBindings);
-
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name,
+ discoveryAddress,
+ discoveryPort,
+ clientID,
+ discoveryRefreshTimeout,
+ pingPeriod,
+ connectionTTL,
+ callTimeout,
+ maxConnections,
+ minLargeMessageSize,
+ consumerWindowSize,
+ consumerMaxRate,
+ producerWindowSize,
+ producerMaxRate,
+ blockOnAcknowledge,
+ blockOnPersistentSend,
+ blockOnNonPersistentSend,
+ autoGroup,
+ preAcknowledge,
+ loadBalancingPolicyClassName,
+ transactionBatchSize,
+ dupsOKBatchSize,
+ initialWaitTimeout,
+ useGlobalPools,
+ scheduledThreadPoolMaxSize,
+ threadPoolMaxSize,
+ retryInterval,
+ retryIntervalMultiplier,
+ reconnectAttempts,
+ failoverOnServerShutdown,
+ jndiBindingsList);
+
sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
- public void createConnectionFactory(String name, TransportConfiguration liveTC, List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String liveTransportClassName,
+ final Map<String, Object> liveTransportParams,
+ final String[] jndiBindings) throws Exception
{
- server.createConnectionFactory(name, liveTC, jndiBindings);
-
+ TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
+
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name, liveTC, jndiBindingsList);
+
sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
- public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- String clientID,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String liveTransportClassName,
+ final Map<String, Object> liveTransportParams,
+ final String clientID,
+ final String[] jndiBindings) throws Exception
{
- server.createConnectionFactory(name, liveTC, clientID, jndiBindings);
-
+ TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
+
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name, liveTC, clientID, jndiBindingsList);
+
sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
- public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- TransportConfiguration backupTC,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String liveTransportClassName,
+ final Map<String, Object> liveTransportParams,
+ final String backupTransportClassName,
+ final Map<String, Object> backupTransportParams,
+ final String[] jndiBindings) throws Exception
{
- server.createConnectionFactory(name, liveTC, backupTC, jndiBindings);
-
+ TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
+
+ TransportConfiguration backupTC = new TransportConfiguration(backupTransportClassName, backupTransportParams);
+
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name, liveTC, backupTC, jndiBindingsList);
+
sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
- public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- TransportConfiguration backupTC,
- String clientID,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String liveTransportClassName,
+ final Map<String, Object> liveTransportParams,
+ final String backupTransportClassName,
+ final Map<String, Object> backupTransportParams,
+ final String clientID,
+ final String[] jndiBindings) throws Exception
{
- server.createConnectionFactory(name, liveTC, backupTC, clientID, jndiBindings);
-
+ TransportConfiguration liveTC = new TransportConfiguration(liveTransportClassName, liveTransportParams);
+
+ TransportConfiguration backupTC = new TransportConfiguration(backupTransportClassName, backupTransportParams);
+
+ List<String> jndiBindingsList = Arrays.asList(jndiBindings);
+
+ server.createConnectionFactory(name, liveTC, backupTC, clientID, jndiBindingsList);
+
sendNotification(NotificationType.CONNECTION_FACTORY_CREATED, name);
}
-
+
public boolean createQueue(final String name, final String jndiBinding) throws Exception
{
boolean created = server.createQueue(name, jndiBinding);
@@ -307,7 +452,7 @@
this.getClass().getName(),
"Notifications emitted by a JMS Server") };
}
-
+
public String[] listRemoteAddresses() throws Exception
{
return server.listRemoteAddresses();
@@ -379,5 +524,4 @@
CONNECTION_FACTORY_DESTROYED;
}
-
}
Modified: trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/src/main/org/jboss/messaging/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -22,23 +22,22 @@
package org.jboss.messaging.jms.server.management.jmx.impl;
-import java.util.List;
+import java.util.Map;
import javax.management.MBeanInfo;
-import org.jboss.messaging.core.config.TransportConfiguration;
import org.jboss.messaging.core.management.ReplicationOperationInvoker;
import org.jboss.messaging.core.management.ResourceNames;
import org.jboss.messaging.core.management.impl.MBeanInfoHelper;
import org.jboss.messaging.core.management.jmx.impl.ReplicationAwareStandardMBeanWrapper;
import org.jboss.messaging.jms.server.management.JMSServerControlMBean;
import org.jboss.messaging.jms.server.management.impl.JMSServerControl;
-import org.jboss.messaging.utils.Pair;
/**
* A ReplicationAwareJMSServerControlWrapper
*
* @author <a href="jmesnil at redhat.com">Jeff Mesnil</a>
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*/
public class ReplicationAwareJMSServerControlWrapper extends ReplicationAwareStandardMBeanWrapper implements
JMSServerControlMBean
@@ -68,52 +67,41 @@
return localControl.closeConnectionsForAddress(ipAddress);
}
- public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String discoveryAddress,
+ final int discoveryPort,
+ final String clientID,
+ final long discoveryRefreshTimeout,
+ final long pingPeriod,
+ final long connectionTTL,
+ final long callTimeout,
+ final int maxConnections,
+ final int minLargeMessageSize,
+ final int consumerWindowSize,
+ final int consumerMaxRate,
+ final int producerWindowSize,
+ final int producerMaxRate,
+ final boolean blockOnAcknowledge,
+ final boolean blockOnPersistentSend,
+ final boolean blockOnNonPersistentSend,
+ final boolean autoGroup,
+ final boolean preAcknowledge,
+ final String loadBalancingPolicyClassName,
+ final int transactionBatchSize,
+ final int dupsOKBatchSize,
+ final long initialWaitTimeout,
+ final boolean useGlobalPools,
+ final int scheduledThreadPoolMaxSize,
+ final int threadPoolMaxSize,
+ final long retryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean failoverOnServerShutdown,
+ final String[] jndiBindings) throws Exception
{
- replicationAwareInvoke("createConnectionFactory", connectorConfigs, jndiBindings);
- }
-
- public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- String clientID,
- List<String> jndiBindings) throws Exception
- {
- replicationAwareInvoke("createConnectionFactory", connectorConfigs, clientID, jndiBindings);
- }
-
- public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- String clientID,
- long pingPeriod,
- long connectionTTL,
- long callTimeout,
- int maxConnections,
- int minLargeMessageSize,
- int consumerWindowSize,
- int consumerMaxRate,
- int producerWindowSize,
- int producerMaxRate,
- boolean blockOnAcknowledge,
- boolean blockOnPersistentSend,
- boolean blockOnNonPersistentSend,
- boolean autoGroup,
- boolean preAcknowledge,
- String loadBalancingPolicyClassName,
- int transactionBatchSize,
- int dupsOKBatchSize,
- boolean useGlobalPools,
- int scheduledThreadPoolMaxSize,
- int threadPoolMaxSize,
- long retryInterval,
- double retryIntervalMultiplier,
- int reconnectAttempts,
- boolean failoverOnServerShutdown,
- List<String> jndiBindings) throws Exception
- {
replicationAwareInvoke("createConnectionFactory",
- connectorConfigs,
+ discoveryAddress,
+ discoveryPort,
clientID,
pingPeriod,
connectionTTL,
@@ -132,6 +120,7 @@
loadBalancingPolicyClassName,
transactionBatchSize,
dupsOKBatchSize,
+ initialWaitTimeout,
useGlobalPools,
scheduledThreadPoolMaxSize,
threadPoolMaxSize,
@@ -140,53 +129,110 @@
reconnectAttempts,
failoverOnServerShutdown,
jndiBindings);
+
}
- public void createConnectionFactory(String name,
- String discoveryAddress,
- int discoveryPort,
- String clientID,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String discoveryAddress,
+ final int discoveryPort,
+ final String clientID,
+ final String[] jndiBindings) throws Exception
{
replicationAwareInvoke("createConnectionFactory", discoveryAddress, discoveryPort, clientID, jndiBindings);
+
}
- public void createConnectionFactory(String name,
- String discoveryAddress,
- int discoveryPort,
- String clientID,
- long discoveryRefreshTimeout,
- long pingPeriod,
- long connectionTTL,
- long callTimeout,
- int maxConnections,
- int minLargeMessageSize,
- int consumerWindowSize,
- int consumerMaxRate,
- int producerWindowSize,
- int producerMaxRate,
- boolean blockOnAcknowledge,
- boolean blockOnPersistentSend,
- boolean blockOnNonPersistentSend,
- boolean autoGroup,
- boolean preAcknowledge,
- String loadBalancingPolicyClassName,
- int transactionBatchSize,
- int dupsOKBatchSize,
- long initialWaitTimeout,
- boolean useGlobalPools,
- int scheduledThreadPoolMaxSize,
- int threadPoolMaxSize,
- long retryInterval,
- double retryIntervalMultiplier,
- int reconnectAttempts,
- boolean failoverOnServerShutdown,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String liveTransportClassName,
+ final Map<String, Object> liveTransportParams,
+ final String backupTransportClassName,
+ final Map<String, Object> backupTransportParams,
+ final String clientID,
+ final String[] jndiBindings) throws Exception
{
replicationAwareInvoke("createConnectionFactory",
- discoveryAddress,
- discoveryPort,
+ liveTransportClassName,
+ liveTransportParams,
+ backupTransportClassName,
+ backupTransportParams,
clientID,
+ jndiBindings);
+ }
+
+ public void createConnectionFactory(final String name,
+ final String liveTransportClassName,
+ final Map<String, Object> liveTransportParams,
+ final String backupTransportClassName,
+ final Map<String, Object> backupTransportParams,
+ final String[] jndiBindings) throws Exception
+ {
+ replicationAwareInvoke("createConnectionFactory",
+ liveTransportClassName,
+ liveTransportParams,
+ backupTransportClassName,
+ backupTransportParams,
+ jndiBindings);
+ }
+
+ public void createConnectionFactory(final String name,
+ final String liveTransportClassName,
+ final Map<String, Object> liveTransportParams,
+ final String clientID,
+ final String[] jndiBindings) throws Exception
+ {
+ replicationAwareInvoke("createConnectionFactory",
+ liveTransportClassName,
+ liveTransportParams,
+ clientID,
+ jndiBindings);
+ }
+
+ public void createConnectionFactory(final String name,
+ final String liveTransportClassName,
+ final Map<String, Object> liveTransportParams,
+ final String[] jndiBindings) throws Exception
+ {
+ replicationAwareInvoke("createConnectionFactory", liveTransportClassName, liveTransportParams, jndiBindings);
+ }
+
+ public void createConnectionFactory(final String name,
+ final String[] liveConnectorsTransportClassNames,
+ final Map<String, Object>[] liveConnectorTransportParams,
+ final String[] backupConnectorsTransportClassNames,
+ final Map<String, Object>[] backupConnectorTransportParams,
+ final String clientID,
+ final long pingPeriod,
+ final long connectionTTL,
+ final long callTimeout,
+ final int maxConnections,
+ final int minLargeMessageSize,
+ final int consumerWindowSize,
+ final int consumerMaxRate,
+ final int producerWindowSize,
+ final int producerMaxRate,
+ final boolean blockOnAcknowledge,
+ final boolean blockOnPersistentSend,
+ final boolean blockOnNonPersistentSend,
+ final boolean autoGroup,
+ final boolean preAcknowledge,
+ final String loadBalancingPolicyClassName,
+ final int transactionBatchSize,
+ final int dupsOKBatchSize,
+ final boolean useGlobalPools,
+ final int scheduledThreadPoolMaxSize,
+ final int threadPoolMaxSize,
+ final long retryInterval,
+ final double retryIntervalMultiplier,
+ final int reconnectAttempts,
+ final boolean failoverOnServerShutdown,
+ final String[] jndiBindings) throws Exception
+ {
+ replicationAwareInvoke("createConnectionFactory",
+ liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams,
+ clientID,
pingPeriod,
connectionTTL,
callTimeout,
@@ -204,7 +250,6 @@
loadBalancingPolicyClassName,
transactionBatchSize,
dupsOKBatchSize,
- initialWaitTimeout,
useGlobalPools,
scheduledThreadPoolMaxSize,
threadPoolMaxSize,
@@ -215,34 +260,38 @@
jndiBindings);
}
- public void createConnectionFactory(String name, TransportConfiguration liveTC, List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String[] liveConnectorsTransportClassNames,
+ final Map<String, Object>[] liveConnectorTransportParams,
+ final String[] backupConnectorsTransportClassNames,
+ final Map<String, Object>[] backupConnectorTransportParams,
+ final String clientID,
+ final String[] jndiBindings) throws Exception
{
- replicationAwareInvoke("createConnectionFactory", liveTC, jndiBindings);
- }
+ replicationAwareInvoke("createConnectionFactory",
+ liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams,
+ clientID,
- public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- String clientID,
- List<String> jndiBindings) throws Exception
- {
- replicationAwareInvoke("createConnectionFactory", liveTC, clientID, jndiBindings);
+ jndiBindings);
}
- public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- TransportConfiguration backupTC,
- List<String> jndiBindings) throws Exception
+ public void createConnectionFactory(final String name,
+ final String[] liveConnectorsTransportClassNames,
+ final Map<String, Object>[] liveConnectorTransportParams,
+ final String[] backupConnectorsTransportClassNames,
+ final Map<String, Object>[] backupConnectorTransportParams,
+ final String[] jndiBindings) throws Exception
{
- replicationAwareInvoke("createConnectionFactory", liveTC, backupTC, jndiBindings);
- }
+ replicationAwareInvoke("createConnectionFactory",
+ liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams,
- public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- TransportConfiguration backupTC,
- String clientID,
- List<String> jndiBindings) throws Exception
- {
- replicationAwareInvoke("createConnectionFactory", liveTC, backupTC, clientID, jndiBindings);
+ jndiBindings);
}
public boolean createQueue(final String name, final String jndiBinding) throws Exception
Added: trunk/src/main/org/jboss/messaging/utils/json/JSONArray.java
===================================================================
--- trunk/src/main/org/jboss/messaging/utils/json/JSONArray.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/utils/json/JSONArray.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -0,0 +1,960 @@
+package org.jboss.messaging.utils.json;
+
+/*
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * A JSONArray is an ordered sequence of values. Its external text form is a
+ * string wrapped in square brackets with commas separating the values. The
+ * internal form is an object having <code>get</code> and <code>opt</code>
+ * methods for accessing the values by index, and <code>put</code> methods for
+ * adding or replacing values. The values can be any of these types:
+ * <code>Boolean</code>, <code>JSONArray</code>, <code>JSONObject</code>,
+ * <code>Number</code>, <code>String</code>, or the
+ * <code>JSONObject.NULL object</code>.
+ * <p>
+ * The constructor can convert a JSON text into a Java object. The
+ * <code>toString</code> method converts to JSON text.
+ * <p>
+ * A <code>get</code> method returns a value if one can be found, and throws an
+ * exception if one cannot be found. An <code>opt</code> method returns a
+ * default value instead of throwing an exception, and so is useful for
+ * obtaining optional values.
+ * <p>
+ * The generic <code>get()</code> and <code>opt()</code> methods return an
+ * object which you can cast or query for type. There are also typed
+ * <code>get</code> and <code>opt</code> methods that do type checking and type
+ * coercion for you.
+ * <p>
+ * The texts produced by the <code>toString</code> methods strictly conform to
+ * JSON syntax rules. The constructors are more forgiving in the texts they will
+ * accept:
+ * <ul>
+ * <li>An extra <code>,</code> <small>(comma)</small> may appear just
+ * before the closing bracket.</li>
+ * <li>The <code>null</code> value will be inserted when there
+ * is <code>,</code> <small>(comma)</small> elision.</li>
+ * <li>Strings may be quoted with <code>'</code> <small>(single
+ * quote)</small>.</li>
+ * <li>Strings do not need to be quoted at all if they do not begin with a quote
+ * or single quote, and if they do not contain leading or trailing spaces,
+ * and if they do not contain any of these characters:
+ * <code>{ } [ ] / \ : , = ; #</code> and if they do not look like numbers
+ * and if they are not the reserved words <code>true</code>,
+ * <code>false</code>, or <code>null</code>.</li>
+ * <li>Values can be separated by <code>;</code> <small>(semicolon)</small> as
+ * well as by <code>,</code> <small>(comma)</small>.</li>
+ * <li>Numbers may have the <code>0-</code> <small>(octal)</small> or
+ * <code>0x-</code> <small>(hex)</small> prefix.</li>
+ * </ul>
+
+ * @author JSON.org
+ * @version 2009-04-13
+ */
+public class JSONArray {
+
+
+ /**
+ * The arrayList where the JSONArray's properties are kept.
+ */
+ private ArrayList myArrayList;
+
+
+ /**
+ * Construct an empty JSONArray.
+ */
+ public JSONArray() {
+ this.myArrayList = new ArrayList();
+ }
+
+ /**
+ * Construct a JSONArray from a JSONTokener.
+ * @param x A JSONTokener
+ * @throws JSONException If there is a syntax error.
+ */
+ public JSONArray(JSONTokener x) throws JSONException {
+ this();
+ char c = x.nextClean();
+ char q;
+ if (c == '[') {
+ q = ']';
+ } else if (c == '(') {
+ q = ')';
+ } else {
+ throw x.syntaxError("A JSONArray text must start with '['");
+ }
+ if (x.nextClean() == ']') {
+ return;
+ }
+ x.back();
+ for (;;) {
+ if (x.nextClean() == ',') {
+ x.back();
+ this.myArrayList.add(null);
+ } else {
+ x.back();
+ this.myArrayList.add(x.nextValue());
+ }
+ c = x.nextClean();
+ switch (c) {
+ case ';':
+ case ',':
+ if (x.nextClean() == ']') {
+ return;
+ }
+ x.back();
+ break;
+ case ']':
+ case ')':
+ if (q != c) {
+ throw x.syntaxError("Expected a '" + new Character(q) + "'");
+ }
+ return;
+ default:
+ throw x.syntaxError("Expected a ',' or ']'");
+ }
+ }
+ }
+
+
+ /**
+ * Construct a JSONArray from a source JSON text.
+ * @param source A string that begins with
+ * <code>[</code> <small>(left bracket)</small>
+ * and ends with <code>]</code> <small>(right bracket)</small>.
+ * @throws JSONException If there is a syntax error.
+ */
+ public JSONArray(String source) throws JSONException {
+ this(new JSONTokener(source));
+ }
+
+
+ /**
+ * Construct a JSONArray from a Collection.
+ * @param collection A Collection.
+ */
+ public JSONArray(Collection collection) {
+ this.myArrayList = (collection == null) ?
+ new ArrayList() :
+ new ArrayList(collection);
+ }
+
+ /**
+ * Construct a JSONArray from a collection of beans.
+ * The collection should have Java Beans.
+ *
+ * @throws JSONException If not an array.
+ */
+
+ public JSONArray(Collection collection, boolean includeSuperClass) {
+ this.myArrayList = new ArrayList();
+ if (collection != null) {
+ Iterator iter = collection.iterator();;
+ while (iter.hasNext()) {
+ Object o = iter.next();
+ if (o instanceof Map) {
+ this.myArrayList.add(new JSONObject((Map)o, includeSuperClass));
+ } else if (!JSONObject.isStandardProperty(o.getClass())) {
+ this.myArrayList.add(new JSONObject(o, includeSuperClass));
+ } else {
+ this.myArrayList.add(o);
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Construct a JSONArray from an array
+ * @throws JSONException If not an array.
+ */
+ public JSONArray(Object array) throws JSONException {
+ this();
+ if (array.getClass().isArray()) {
+ int length = Array.getLength(array);
+ for (int i = 0; i < length; i += 1) {
+ this.put(Array.get(array, i));
+ }
+ } else {
+ throw new JSONException("JSONArray initial value should be a string or collection or array.");
+ }
+ }
+
+ /**
+ * Construct a JSONArray from an array with a bean.
+ * The array should have Java Beans.
+ *
+ * @throws JSONException If not an array.
+ */
+ public JSONArray(Object array,boolean includeSuperClass) throws JSONException {
+ this();
+ if (array.getClass().isArray()) {
+ int length = Array.getLength(array);
+ for (int i = 0; i < length; i += 1) {
+ Object o = Array.get(array, i);
+ if (JSONObject.isStandardProperty(o.getClass())) {
+ this.myArrayList.add(o);
+ } else {
+ this.myArrayList.add(new JSONObject(o,includeSuperClass));
+ }
+ }
+ } else {
+ throw new JSONException("JSONArray initial value should be a string or collection or array.");
+ }
+ }
+
+
+
+ /**
+ * Get the object value associated with an index.
+ * @param index
+ * The index must be between 0 and length() - 1.
+ * @return An object value.
+ * @throws JSONException If there is no value for the index.
+ */
+ public Object get(int index) throws JSONException {
+ Object o = opt(index);
+ if (o == null) {
+ throw new JSONException("JSONArray[" + index + "] not found.");
+ }
+ return o;
+ }
+
+
+ /**
+ * Get the boolean value associated with an index.
+ * The string values "true" and "false" are converted to boolean.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return The truth.
+ * @throws JSONException If there is no value for the index or if the
+ * value is not convertable to boolean.
+ */
+ public boolean getBoolean(int index) throws JSONException {
+ Object o = get(index);
+ if (o.equals(Boolean.FALSE) ||
+ (o instanceof String &&
+ ((String)o).equalsIgnoreCase("false"))) {
+ return false;
+ } else if (o.equals(Boolean.TRUE) ||
+ (o instanceof String &&
+ ((String)o).equalsIgnoreCase("true"))) {
+ return true;
+ }
+ throw new JSONException("JSONArray[" + index + "] is not a Boolean.");
+ }
+
+
+ /**
+ * Get the double value associated with an index.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return The value.
+ * @throws JSONException If the key is not found or if the value cannot
+ * be converted to a number.
+ */
+ public double getDouble(int index) throws JSONException {
+ Object o = get(index);
+ try {
+ return o instanceof Number ?
+ ((Number)o).doubleValue() :
+ Double.valueOf((String)o).doubleValue();
+ } catch (Exception e) {
+ throw new JSONException("JSONArray[" + index +
+ "] is not a number.");
+ }
+ }
+
+
+ /**
+ * Get the int value associated with an index.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return The value.
+ * @throws JSONException If the key is not found or if the value cannot
+ * be converted to a number.
+ * if the value cannot be converted to a number.
+ */
+ public int getInt(int index) throws JSONException {
+ Object o = get(index);
+ return o instanceof Number ?
+ ((Number)o).intValue() : (int)getDouble(index);
+ }
+
+
+ /**
+ * Get the JSONArray associated with an index.
+ * @param index The index must be between 0 and length() - 1.
+ * @return A JSONArray value.
+ * @throws JSONException If there is no value for the index. or if the
+ * value is not a JSONArray
+ */
+ public JSONArray getJSONArray(int index) throws JSONException {
+ Object o = get(index);
+ if (o instanceof JSONArray) {
+ return (JSONArray)o;
+ }
+ throw new JSONException("JSONArray[" + index +
+ "] is not a JSONArray.");
+ }
+
+
+ /**
+ * Get the JSONObject associated with an index.
+ * @param index subscript
+ * @return A JSONObject value.
+ * @throws JSONException If there is no value for the index or if the
+ * value is not a JSONObject
+ */
+ public JSONObject getJSONObject(int index) throws JSONException {
+ Object o = get(index);
+ if (o instanceof JSONObject) {
+ return (JSONObject)o;
+ }
+ throw new JSONException("JSONArray[" + index +
+ "] is not a JSONObject.");
+ }
+
+
+ /**
+ * Get the long value associated with an index.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return The value.
+ * @throws JSONException If the key is not found or if the value cannot
+ * be converted to a number.
+ */
+ public long getLong(int index) throws JSONException {
+ Object o = get(index);
+ return o instanceof Number ?
+ ((Number)o).longValue() : (long)getDouble(index);
+ }
+
+
+ /**
+ * Get the string associated with an index.
+ * @param index The index must be between 0 and length() - 1.
+ * @return A string value.
+ * @throws JSONException If there is no value for the index.
+ */
+ public String getString(int index) throws JSONException {
+ return get(index).toString();
+ }
+
+
+ /**
+ * Determine if the value is null.
+ * @param index The index must be between 0 and length() - 1.
+ * @return true if the value at the index is null, or if there is no value.
+ */
+ public boolean isNull(int index) {
+ return JSONObject.NULL.equals(opt(index));
+ }
+
+
+ /**
+ * Make a string from the contents of this JSONArray. The
+ * <code>separator</code> string is inserted between each element.
+ * Warning: This method assumes that the data structure is acyclical.
+ * @param separator A string that will be inserted between the elements.
+ * @return a string.
+ * @throws JSONException If the array contains an invalid number.
+ */
+ public String join(String separator) throws JSONException {
+ int len = length();
+ StringBuffer sb = new StringBuffer();
+
+ for (int i = 0; i < len; i += 1) {
+ if (i > 0) {
+ sb.append(separator);
+ }
+ sb.append(JSONObject.valueToString(this.myArrayList.get(i)));
+ }
+ return sb.toString();
+ }
+
+
+ /**
+ * Get the number of elements in the JSONArray, included nulls.
+ *
+ * @return The length (or size).
+ */
+ public int length() {
+ return this.myArrayList.size();
+ }
+
+
+ /**
+ * Get the optional object value associated with an index.
+ * @param index The index must be between 0 and length() - 1.
+ * @return An object value, or null if there is no
+ * object at that index.
+ */
+ public Object opt(int index) {
+ return (index < 0 || index >= length()) ?
+ null : this.myArrayList.get(index);
+ }
+
+
+ /**
+ * Get the optional boolean value associated with an index.
+ * It returns false if there is no value at that index,
+ * or if the value is not Boolean.TRUE or the String "true".
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return The truth.
+ */
+ public boolean optBoolean(int index) {
+ return optBoolean(index, false);
+ }
+
+
+ /**
+ * Get the optional boolean value associated with an index.
+ * It returns the defaultValue if there is no value at that index or if
+ * it is not a Boolean or the String "true" or "false" (case insensitive).
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @param defaultValue A boolean default.
+ * @return The truth.
+ */
+ public boolean optBoolean(int index, boolean defaultValue) {
+ try {
+ return getBoolean(index);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+
+ /**
+ * Get the optional double value associated with an index.
+ * NaN is returned if there is no value for the index,
+ * or if the value is not a number and cannot be converted to a number.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return The value.
+ */
+ public double optDouble(int index) {
+ return optDouble(index, Double.NaN);
+ }
+
+
+ /**
+ * Get the optional double value associated with an index.
+ * The defaultValue is returned if there is no value for the index,
+ * or if the value is not a number and cannot be converted to a number.
+ *
+ * @param index subscript
+ * @param defaultValue The default value.
+ * @return The value.
+ */
+ public double optDouble(int index, double defaultValue) {
+ try {
+ return getDouble(index);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+
+ /**
+ * Get the optional int value associated with an index.
+ * Zero is returned if there is no value for the index,
+ * or if the value is not a number and cannot be converted to a number.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return The value.
+ */
+ public int optInt(int index) {
+ return optInt(index, 0);
+ }
+
+
+ /**
+ * Get the optional int value associated with an index.
+ * The defaultValue is returned if there is no value for the index,
+ * or if the value is not a number and cannot be converted to a number.
+ * @param index The index must be between 0 and length() - 1.
+ * @param defaultValue The default value.
+ * @return The value.
+ */
+ public int optInt(int index, int defaultValue) {
+ try {
+ return getInt(index);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+
+ /**
+ * Get the optional JSONArray associated with an index.
+ * @param index subscript
+ * @return A JSONArray value, or null if the index has no value,
+ * or if the value is not a JSONArray.
+ */
+ public JSONArray optJSONArray(int index) {
+ Object o = opt(index);
+ return o instanceof JSONArray ? (JSONArray)o : null;
+ }
+
+
+ /**
+ * Get the optional JSONObject associated with an index.
+ * Null is returned if the key is not found, or null if the index has
+ * no value, or if the value is not a JSONObject.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return A JSONObject value.
+ */
+ public JSONObject optJSONObject(int index) {
+ Object o = opt(index);
+ return o instanceof JSONObject ? (JSONObject)o : null;
+ }
+
+
+ /**
+ * Get the optional long value associated with an index.
+ * Zero is returned if there is no value for the index,
+ * or if the value is not a number and cannot be converted to a number.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return The value.
+ */
+ public long optLong(int index) {
+ return optLong(index, 0);
+ }
+
+
+ /**
+ * Get the optional long value associated with an index.
+ * The defaultValue is returned if there is no value for the index,
+ * or if the value is not a number and cannot be converted to a number.
+ * @param index The index must be between 0 and length() - 1.
+ * @param defaultValue The default value.
+ * @return The value.
+ */
+ public long optLong(int index, long defaultValue) {
+ try {
+ return getLong(index);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+
+ /**
+ * Get the optional string value associated with an index. It returns an
+ * empty string if there is no value at that index. If the value
+ * is not a string and is not null, then it is coverted to a string.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @return A String value.
+ */
+ public String optString(int index) {
+ return optString(index, "");
+ }
+
+
+ /**
+ * Get the optional string associated with an index.
+ * The defaultValue is returned if the key is not found.
+ *
+ * @param index The index must be between 0 and length() - 1.
+ * @param defaultValue The default value.
+ * @return A String value.
+ */
+ public String optString(int index, String defaultValue) {
+ Object o = opt(index);
+ return o != null ? o.toString() : defaultValue;
+ }
+
+
+ /**
+ * Append a boolean value. This increases the array's length by one.
+ *
+ * @param value A boolean value.
+ * @return this.
+ */
+ public JSONArray put(boolean value) {
+ put(value ? Boolean.TRUE : Boolean.FALSE);
+ return this;
+ }
+
+
+ /**
+ * Put a value in the JSONArray, where the value will be a
+ * JSONArray which is produced from a Collection.
+ * @param value A Collection value.
+ * @return this.
+ */
+ public JSONArray put(Collection value) {
+ put(new JSONArray(value));
+ return this;
+ }
+
+
+ /**
+ * Append a double value. This increases the array's length by one.
+ *
+ * @param value A double value.
+ * @throws JSONException if the value is not finite.
+ * @return this.
+ */
+ public JSONArray put(double value) throws JSONException {
+ Double d = new Double(value);
+ JSONObject.testValidity(d);
+ put(d);
+ return this;
+ }
+
+
+ /**
+ * Append an int value. This increases the array's length by one.
+ *
+ * @param value An int value.
+ * @return this.
+ */
+ public JSONArray put(int value) {
+ put(new Integer(value));
+ return this;
+ }
+
+
+ /**
+ * Append an long value. This increases the array's length by one.
+ *
+ * @param value A long value.
+ * @return this.
+ */
+ public JSONArray put(long value) {
+ put(new Long(value));
+ return this;
+ }
+
+
+ /**
+ * Put a value in the JSONArray, where the value will be a
+ * JSONObject which is produced from a Map.
+ * @param value A Map value.
+ * @return this.
+ */
+ public JSONArray put(Map value) {
+ put(new JSONObject(value));
+ return this;
+ }
+
+
+ /**
+ * Append an object value. This increases the array's length by one.
+ * @param value An object value. The value should be a
+ * Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+ * JSONObject.NULL object.
+ * @return this.
+ */
+ public JSONArray put(Object value) {
+ this.myArrayList.add(value);
+ return this;
+ }
+
+
+ /**
+ * Put or replace a boolean value in the JSONArray. If the index is greater
+ * than the length of the JSONArray, then null elements will be added as
+ * necessary to pad it out.
+ * @param index The subscript.
+ * @param value A boolean value.
+ * @return this.
+ * @throws JSONException If the index is negative.
+ */
+ public JSONArray put(int index, boolean value) throws JSONException {
+ put(index, value ? Boolean.TRUE : Boolean.FALSE);
+ return this;
+ }
+
+
+ /**
+ * Put a value in the JSONArray, where the value will be a
+ * JSONArray which is produced from a Collection.
+ * @param index The subscript.
+ * @param value A Collection value.
+ * @return this.
+ * @throws JSONException If the index is negative or if the value is
+ * not finite.
+ */
+ public JSONArray put(int index, Collection value) throws JSONException {
+ put(index, new JSONArray(value));
+ return this;
+ }
+
+
+ /**
+ * Put or replace a double value. If the index is greater than the length of
+ * the JSONArray, then null elements will be added as necessary to pad
+ * it out.
+ * @param index The subscript.
+ * @param value A double value.
+ * @return this.
+ * @throws JSONException If the index is negative or if the value is
+ * not finite.
+ */
+ public JSONArray put(int index, double value) throws JSONException {
+ put(index, new Double(value));
+ return this;
+ }
+
+
+ /**
+ * Put or replace an int value. If the index is greater than the length of
+ * the JSONArray, then null elements will be added as necessary to pad
+ * it out.
+ * @param index The subscript.
+ * @param value An int value.
+ * @return this.
+ * @throws JSONException If the index is negative.
+ */
+ public JSONArray put(int index, int value) throws JSONException {
+ put(index, new Integer(value));
+ return this;
+ }
+
+
+ /**
+ * Put or replace a long value. If the index is greater than the length of
+ * the JSONArray, then null elements will be added as necessary to pad
+ * it out.
+ * @param index The subscript.
+ * @param value A long value.
+ * @return this.
+ * @throws JSONException If the index is negative.
+ */
+ public JSONArray put(int index, long value) throws JSONException {
+ put(index, new Long(value));
+ return this;
+ }
+
+
+ /**
+ * Put a value in the JSONArray, where the value will be a
+ * JSONObject which is produced from a Map.
+ * @param index The subscript.
+ * @param value The Map value.
+ * @return this.
+ * @throws JSONException If the index is negative or if the the value is
+ * an invalid number.
+ */
+ public JSONArray put(int index, Map value) throws JSONException {
+ put(index, new JSONObject(value));
+ return this;
+ }
+
+
+ /**
+ * Put or replace an object value in the JSONArray. If the index is greater
+ * than the length of the JSONArray, then null elements will be added as
+ * necessary to pad it out.
+ * @param index The subscript.
+ * @param value The value to put into the array. The value should be a
+ * Boolean, Double, Integer, JSONArray, JSONObject, Long, or String, or the
+ * JSONObject.NULL object.
+ * @return this.
+ * @throws JSONException If the index is negative or if the the value is
+ * an invalid number.
+ */
+ public JSONArray put(int index, Object value) throws JSONException {
+ JSONObject.testValidity(value);
+ if (index < 0) {
+ throw new JSONException("JSONArray[" + index + "] not found.");
+ }
+ if (index < length()) {
+ this.myArrayList.set(index, value);
+ } else {
+ while (index != length()) {
+ put(JSONObject.NULL);
+ }
+ put(value);
+ }
+ return this;
+ }
+
+
+ /**
+ * Remove a index and close the hole.
+ * @param index The index of the element to be removed.
+ * @return The value that was associated with the index,
+ * or null if there was no value.
+ */
+ public Object remove(int index) {
+ Object o = opt(index);
+ this.myArrayList.remove(index);
+ return o;
+ }
+
+
+ /**
+ * Produce a JSONObject by combining a JSONArray of names with the values
+ * of this JSONArray.
+ * @param names A JSONArray containing a list of key strings. These will be
+ * paired with the values.
+ * @return A JSONObject, or null if there are no names or if this JSONArray
+ * has no values.
+ * @throws JSONException If any of the names are null.
+ */
+ public JSONObject toJSONObject(JSONArray names) throws JSONException {
+ if (names == null || names.length() == 0 || length() == 0) {
+ return null;
+ }
+ JSONObject jo = new JSONObject();
+ for (int i = 0; i < names.length(); i += 1) {
+ jo.put(names.getString(i), this.opt(i));
+ }
+ return jo;
+ }
+
+
+ /**
+ * Make a JSON text of this JSONArray. For compactness, no
+ * unnecessary whitespace is added. If it is not possible to produce a
+ * syntactically correct JSON text then null will be returned instead. This
+ * could occur if the array contains an invalid number.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return a printable, displayable, transmittable
+ * representation of the array.
+ */
+ public String toString() {
+ try {
+ return '[' + join(",") + ']';
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+
+ /**
+ * Make a prettyprinted JSON text of this JSONArray.
+ * Warning: This method assumes that the data structure is acyclical.
+ * @param indentFactor The number of spaces to add to each level of
+ * indentation.
+ * @return a printable, displayable, transmittable
+ * representation of the object, beginning
+ * with <code>[</code> <small>(left bracket)</small> and ending
+ * with <code>]</code> <small>(right bracket)</small>.
+ * @throws JSONException
+ */
+ public String toString(int indentFactor) throws JSONException {
+ return toString(indentFactor, 0);
+ }
+
+
+ /**
+ * Make a prettyprinted JSON text of this JSONArray.
+ * Warning: This method assumes that the data structure is acyclical.
+ * @param indentFactor The number of spaces to add to each level of
+ * indentation.
+ * @param indent The indention of the top level.
+ * @return a printable, displayable, transmittable
+ * representation of the array.
+ * @throws JSONException
+ */
+ String toString(int indentFactor, int indent) throws JSONException {
+ int len = length();
+ if (len == 0) {
+ return "[]";
+ }
+ int i;
+ StringBuffer sb = new StringBuffer("[");
+ if (len == 1) {
+ sb.append(JSONObject.valueToString(this.myArrayList.get(0),
+ indentFactor, indent));
+ } else {
+ int newindent = indent + indentFactor;
+ sb.append('\n');
+ for (i = 0; i < len; i += 1) {
+ if (i > 0) {
+ sb.append(",\n");
+ }
+ for (int j = 0; j < newindent; j += 1) {
+ sb.append(' ');
+ }
+ sb.append(JSONObject.valueToString(this.myArrayList.get(i),
+ indentFactor, newindent));
+ }
+ sb.append('\n');
+ for (i = 0; i < indent; i += 1) {
+ sb.append(' ');
+ }
+ }
+ sb.append(']');
+ return sb.toString();
+ }
+
+
+ /**
+ * Write the contents of the JSONArray as JSON text to a writer.
+ * For compactness, no whitespace is added.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return The writer.
+ * @throws JSONException
+ */
+ public Writer write(Writer writer) throws JSONException {
+ try {
+ boolean b = false;
+ int len = length();
+
+ writer.write('[');
+
+ for (int i = 0; i < len; i += 1) {
+ if (b) {
+ writer.write(',');
+ }
+ Object v = this.myArrayList.get(i);
+ if (v instanceof JSONObject) {
+ ((JSONObject)v).write(writer);
+ } else if (v instanceof JSONArray) {
+ ((JSONArray)v).write(writer);
+ } else {
+ writer.write(JSONObject.valueToString(v));
+ }
+ b = true;
+ }
+ writer.write(']');
+ return writer;
+ } catch (IOException e) {
+ throw new JSONException(e);
+ }
+ }
+}
\ No newline at end of file
Added: trunk/src/main/org/jboss/messaging/utils/json/JSONException.java
===================================================================
--- trunk/src/main/org/jboss/messaging/utils/json/JSONException.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/utils/json/JSONException.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -0,0 +1,27 @@
+package org.jboss.messaging.utils.json;
+
+/**
+ * The JSONException is thrown by the JSON.org classes then things are amiss.
+ * @author JSON.org
+ * @version 2008-09-18
+ */
+public class JSONException extends Exception {
+ private Throwable cause;
+
+ /**
+ * Constructs a JSONException with an explanatory message.
+ * @param message Detail about the reason for the exception.
+ */
+ public JSONException(String message) {
+ super(message);
+ }
+
+ public JSONException(Throwable t) {
+ super(t.getMessage());
+ this.cause = t;
+ }
+
+ public Throwable getCause() {
+ return this.cause;
+ }
+}
Added: trunk/src/main/org/jboss/messaging/utils/json/JSONObject.java
===================================================================
--- trunk/src/main/org/jboss/messaging/utils/json/JSONObject.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/utils/json/JSONObject.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -0,0 +1,1569 @@
+package org.jboss.messaging.utils.json;
+
+/*
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+import java.io.IOException;
+import java.io.Writer;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeSet;
+
+/**
+ * A JSONObject is an unordered collection of name/value pairs. Its
+ * external form is a string wrapped in curly braces with colons between the
+ * names and values, and commas between the values and names. The internal form
+ * is an object having <code>get</code> and <code>opt</code> methods for
+ * accessing the values by name, and <code>put</code> methods for adding or
+ * replacing values by name. The values can be any of these types:
+ * <code>Boolean</code>, <code>JSONArray</code>, <code>JSONObject</code>,
+ * <code>Number</code>, <code>String</code>, or the <code>JSONObject.NULL</code>
+ * object. A JSONObject constructor can be used to convert an external form
+ * JSON text into an internal form whose values can be retrieved with the
+ * <code>get</code> and <code>opt</code> methods, or to convert values into a
+ * JSON text using the <code>put</code> and <code>toString</code> methods.
+ * A <code>get</code> method returns a value if one can be found, and throws an
+ * exception if one cannot be found. An <code>opt</code> method returns a
+ * default value instead of throwing an exception, and so is useful for
+ * obtaining optional values.
+ * <p>
+ * The generic <code>get()</code> and <code>opt()</code> methods return an
+ * object, which you can cast or query for type. There are also typed
+ * <code>get</code> and <code>opt</code> methods that do type checking and type
+ * coercion for you.
+ * <p>
+ * The <code>put</code> methods adds values to an object. For example, <pre>
+ * myString = new JSONObject().put("JSON", "Hello, World!").toString();</pre>
+ * produces the string <code>{"JSON": "Hello, World"}</code>.
+ * <p>
+ * The texts produced by the <code>toString</code> methods strictly conform to
+ * the JSON syntax rules.
+ * The constructors are more forgiving in the texts they will accept:
+ * <ul>
+ * <li>An extra <code>,</code> <small>(comma)</small> may appear just
+ * before the closing brace.</li>
+ * <li>Strings may be quoted with <code>'</code> <small>(single
+ * quote)</small>.</li>
+ * <li>Strings do not need to be quoted at all if they do not begin with a quote
+ * or single quote, and if they do not contain leading or trailing spaces,
+ * and if they do not contain any of these characters:
+ * <code>{ } [ ] / \ : , = ; #</code> and if they do not look like numbers
+ * and if they are not the reserved words <code>true</code>,
+ * <code>false</code>, or <code>null</code>.</li>
+ * <li>Keys can be followed by <code>=</code> or <code>=></code> as well as
+ * by <code>:</code>.</li>
+ * <li>Values can be followed by <code>;</code> <small>(semicolon)</small> as
+ * well as by <code>,</code> <small>(comma)</small>.</li>
+ * <li>Numbers may have the <code>0-</code> <small>(octal)</small> or
+ * <code>0x-</code> <small>(hex)</small> prefix.</li>
+ * </ul>
+ * @author JSON.org
+ * @version 2009-03-06
+ */
+public class JSONObject {
+
+ /**
+ * JSONObject.NULL is equivalent to the value that JavaScript calls null,
+ * whilst Java's null is equivalent to the value that JavaScript calls
+ * undefined.
+ */
+ private static final class Null {
+
+ /**
+ * There is only intended to be a single instance of the NULL object,
+ * so the clone method returns itself.
+ * @return NULL.
+ */
+ protected final Object clone() {
+ return this;
+ }
+
+
+ /**
+ * A Null object is equal to the null value and to itself.
+ * @param object An object to test for nullness.
+ * @return true if the object parameter is the JSONObject.NULL object
+ * or null.
+ */
+ public boolean equals(Object object) {
+ return object == null || object == this;
+ }
+
+
+ /**
+ * Get the "null" string value.
+ * @return The string "null".
+ */
+ public String toString() {
+ return "null";
+ }
+ }
+
+
+ /**
+ * The map where the JSONObject's properties are kept.
+ */
+ private Map map;
+
+
+ /**
+ * It is sometimes more convenient and less ambiguous to have a
+ * <code>NULL</code> object than to use Java's <code>null</code> value.
+ * <code>JSONObject.NULL.equals(null)</code> returns <code>true</code>.
+ * <code>JSONObject.NULL.toString()</code> returns <code>"null"</code>.
+ */
+ public static final Object NULL = new Null();
+
+
+ /**
+ * Construct an empty JSONObject.
+ */
+ public JSONObject() {
+ this.map = new HashMap();
+ }
+
+
+ /**
+ * Construct a JSONObject from a subset of another JSONObject.
+ * An array of strings is used to identify the keys that should be copied.
+ * Missing keys are ignored.
+ * @param jo A JSONObject.
+ * @param names An array of strings.
+ * @exception JSONException If a value is a non-finite number or if a name is duplicated.
+ */
+ public JSONObject(JSONObject jo, String[] names) throws JSONException {
+ this();
+ for (int i = 0; i < names.length; i += 1) {
+ putOnce(names[i], jo.opt(names[i]));
+ }
+ }
+
+
+ /**
+ * Construct a JSONObject from a JSONTokener.
+ * @param x A JSONTokener object containing the source string.
+ * @throws JSONException If there is a syntax error in the source string
+ * or a duplicated key.
+ */
+ public JSONObject(JSONTokener x) throws JSONException {
+ this();
+ char c;
+ String key;
+
+ if (x.nextClean() != '{') {
+ throw x.syntaxError("A JSONObject text must begin with '{'");
+ }
+ for (;;) {
+ c = x.nextClean();
+ switch (c) {
+ case 0:
+ throw x.syntaxError("A JSONObject text must end with '}'");
+ case '}':
+ return;
+ default:
+ x.back();
+ key = x.nextValue().toString();
+ }
+
+ /*
+ * The key is followed by ':'. We will also tolerate '=' or '=>'.
+ */
+
+ c = x.nextClean();
+ if (c == '=') {
+ if (x.next() != '>') {
+ x.back();
+ }
+ } else if (c != ':') {
+ throw x.syntaxError("Expected a ':' after a key");
+ }
+ putOnce(key, x.nextValue());
+
+ /*
+ * Pairs are separated by ','. We will also tolerate ';'.
+ */
+
+ switch (x.nextClean()) {
+ case ';':
+ case ',':
+ if (x.nextClean() == '}') {
+ return;
+ }
+ x.back();
+ break;
+ case '}':
+ return;
+ default:
+ throw x.syntaxError("Expected a ',' or '}'");
+ }
+ }
+ }
+
+
+ /**
+ * Construct a JSONObject from a Map.
+ *
+ * @param map A map object that can be used to initialize the contents of
+ * the JSONObject.
+ */
+ public JSONObject(Map map) {
+ this.map = (map == null) ? new HashMap() : map;
+ }
+
+
+ /**
+ * Construct a JSONObject from a Map.
+ *
+ * Note: Use this constructor when the map contains <key,bean>.
+ *
+ * @param map - A map with Key-Bean data.
+ * @param includeSuperClass - Tell whether to include the super class properties.
+ */
+ public JSONObject(Map map, boolean includeSuperClass) {
+ this.map = new HashMap();
+ if (map != null) {
+ Iterator i = map.entrySet().iterator();
+ while (i.hasNext()) {
+ Map.Entry e = (Map.Entry)i.next();
+ if (isStandardProperty(e.getValue().getClass())) {
+ this.map.put(e.getKey(), e.getValue());
+ } else {
+ this.map.put(e.getKey(), new JSONObject(e.getValue(),
+ includeSuperClass));
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Construct a JSONObject from an Object using bean getters.
+ * It reflects on all of the public methods of the object.
+ * For each of the methods with no parameters and a name starting
+ * with <code>"get"</code> or <code>"is"</code> followed by an uppercase letter,
+ * the method is invoked, and a key and the value returned from the getter method
+ * are put into the new JSONObject.
+ *
+ * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix.
+ * If the second remaining character is not upper case, then the first
+ * character is converted to lower case.
+ *
+ * For example, if an object has a method named <code>"getName"</code>, and
+ * if the result of calling <code>object.getName()</code> is <code>"Larry Fine"</code>,
+ * then the JSONObject will contain <code>"name": "Larry Fine"</code>.
+ *
+ * @param bean An object that has getter methods that should be used
+ * to make a JSONObject.
+ */
+ public JSONObject(Object bean) {
+ this();
+ populateInternalMap(bean, false);
+ }
+
+
+ /**
+ * Construct a JSONObject from an Object using bean getters.
+ * It reflects on all of the public methods of the object.
+ * For each of the methods with no parameters and a name starting
+ * with <code>"get"</code> or <code>"is"</code> followed by an uppercase letter,
+ * the method is invoked, and a key and the value returned from the getter method
+ * are put into the new JSONObject.
+ *
+ * The key is formed by removing the <code>"get"</code> or <code>"is"</code> prefix.
+ * If the second remaining character is not upper case, then the first
+ * character is converted to lower case.
+ *
+ * @param bean An object that has getter methods that should be used
+ * to make a JSONObject.
+ * @param includeSuperClass If true, include the super class properties.
+ */
+ public JSONObject(Object bean, boolean includeSuperClass) {
+ this();
+ populateInternalMap(bean, includeSuperClass);
+ }
+
+ private void populateInternalMap(Object bean, boolean includeSuperClass){
+ Class klass = bean.getClass();
+
+ /* If klass.getSuperClass is System class then force includeSuperClass to false. */
+
+ if (klass.getClassLoader() == null) {
+ includeSuperClass = false;
+ }
+
+ Method[] methods = (includeSuperClass) ?
+ klass.getMethods() : klass.getDeclaredMethods();
+ for (int i = 0; i < methods.length; i += 1) {
+ try {
+ Method method = methods[i];
+ if (Modifier.isPublic(method.getModifiers())) {
+ String name = method.getName();
+ String key = "";
+ if (name.startsWith("get")) {
+ key = name.substring(3);
+ } else if (name.startsWith("is")) {
+ key = name.substring(2);
+ }
+ if (key.length() > 0 &&
+ Character.isUpperCase(key.charAt(0)) &&
+ method.getParameterTypes().length == 0) {
+ if (key.length() == 1) {
+ key = key.toLowerCase();
+ } else if (!Character.isUpperCase(key.charAt(1))) {
+ key = key.substring(0, 1).toLowerCase() +
+ key.substring(1);
+ }
+
+ Object result = method.invoke(bean, (Object[])null);
+ if (result == null) {
+ map.put(key, NULL);
+ } else if (result.getClass().isArray()) {
+ map.put(key, new JSONArray(result, includeSuperClass));
+ } else if (result instanceof Collection) { // List or Set
+ map.put(key, new JSONArray((Collection)result, includeSuperClass));
+ } else if (result instanceof Map) {
+ map.put(key, new JSONObject((Map)result, includeSuperClass));
+ } else if (isStandardProperty(result.getClass())) { // Primitives, String and Wrapper
+ map.put(key, result);
+ } else {
+ if (result.getClass().getPackage().getName().startsWith("java") ||
+ result.getClass().getClassLoader() == null) {
+ map.put(key, result.toString());
+ } else { // User defined Objects
+ map.put(key, new JSONObject(result, includeSuperClass));
+ }
+ }
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+
+ static boolean isStandardProperty(Class clazz) {
+ return clazz.isPrimitive() ||
+ clazz.isAssignableFrom(Byte.class) ||
+ clazz.isAssignableFrom(Short.class) ||
+ clazz.isAssignableFrom(Integer.class) ||
+ clazz.isAssignableFrom(Long.class) ||
+ clazz.isAssignableFrom(Float.class) ||
+ clazz.isAssignableFrom(Double.class) ||
+ clazz.isAssignableFrom(Character.class) ||
+ clazz.isAssignableFrom(String.class) ||
+ clazz.isAssignableFrom(Boolean.class);
+ }
+
+
+ /**
+ * Construct a JSONObject from an Object, using reflection to find the
+ * public members. The resulting JSONObject's keys will be the strings
+ * from the names array, and the values will be the field values associated
+ * with those keys in the object. If a key is not found or not visible,
+ * then it will not be copied into the new JSONObject.
+ * @param object An object that has fields that should be used to make a
+ * JSONObject.
+ * @param names An array of strings, the names of the fields to be obtained
+ * from the object.
+ */
+ public JSONObject(Object object, String names[]) {
+ this();
+ Class c = object.getClass();
+ for (int i = 0; i < names.length; i += 1) {
+ String name = names[i];
+ try {
+ putOpt(name, c.getField(name).get(object));
+ } catch (Exception e) {
+ /* forget about it */
+ }
+ }
+ }
+
+
+ /**
+ * Construct a JSONObject from a source JSON text string.
+ * This is the most commonly used JSONObject constructor.
+ * @param source A string beginning
+ * with <code>{</code> <small>(left brace)</small> and ending
+ * with <code>}</code> <small>(right brace)</small>.
+ * @exception JSONException If there is a syntax error in the source
+ * string or a duplicated key.
+ */
+ public JSONObject(String source) throws JSONException {
+ this(new JSONTokener(source));
+ }
+
+
+ /**
+ * Accumulate values under a key. It is similar to the put method except
+ * that if there is already an object stored under the key then a
+ * JSONArray is stored under the key to hold all of the accumulated values.
+ * If there is already a JSONArray, then the new value is appended to it.
+ * In contrast, the put method replaces the previous value.
+ * @param key A key string.
+ * @param value An object to be accumulated under the key.
+ * @return this.
+ * @throws JSONException If the value is an invalid number
+ * or if the key is null.
+ */
+ public JSONObject accumulate(String key, Object value)
+ throws JSONException {
+ testValidity(value);
+ Object o = opt(key);
+ if (o == null) {
+ put(key, value instanceof JSONArray ?
+ new JSONArray().put(value) :
+ value);
+ } else if (o instanceof JSONArray) {
+ ((JSONArray)o).put(value);
+ } else {
+ put(key, new JSONArray().put(o).put(value));
+ }
+ return this;
+ }
+
+
+ /**
+ * Append values to the array under a key. If the key does not exist in the
+ * JSONObject, then the key is put in the JSONObject with its value being a
+ * JSONArray containing the value parameter. If the key was already
+ * associated with a JSONArray, then the value parameter is appended to it.
+ * @param key A key string.
+ * @param value An object to be accumulated under the key.
+ * @return this.
+ * @throws JSONException If the key is null or if the current value
+ * associated with the key is not a JSONArray.
+ */
+ public JSONObject append(String key, Object value)
+ throws JSONException {
+ testValidity(value);
+ Object o = opt(key);
+ if (o == null) {
+ put(key, new JSONArray().put(value));
+ } else if (o instanceof JSONArray) {
+ put(key, ((JSONArray)o).put(value));
+ } else {
+ throw new JSONException("JSONObject[" + key +
+ "] is not a JSONArray.");
+ }
+ return this;
+ }
+
+
+ /**
+ * Produce a string from a double. The string "null" will be returned if
+ * the number is not finite.
+ * @param d A double.
+ * @return A String.
+ */
+ static public String doubleToString(double d) {
+ if (Double.isInfinite(d) || Double.isNaN(d)) {
+ return "null";
+ }
+
+// Shave off trailing zeros and decimal point, if possible.
+
+ String s = Double.toString(d);
+ if (s.indexOf('.') > 0 && s.indexOf('e') < 0 && s.indexOf('E') < 0) {
+ while (s.endsWith("0")) {
+ s = s.substring(0, s.length() - 1);
+ }
+ if (s.endsWith(".")) {
+ s = s.substring(0, s.length() - 1);
+ }
+ }
+ return s;
+ }
+
+
+ /**
+ * Get the value object associated with a key.
+ *
+ * @param key A key string.
+ * @return The object associated with the key.
+ * @throws JSONException if the key is not found.
+ */
+ public Object get(String key) throws JSONException {
+ Object o = opt(key);
+ if (o == null) {
+ throw new JSONException("JSONObject[" + quote(key) +
+ "] not found.");
+ }
+ return o;
+ }
+
+
+ /**
+ * Get the boolean value associated with a key.
+ *
+ * @param key A key string.
+ * @return The truth.
+ * @throws JSONException
+ * if the value is not a Boolean or the String "true" or "false".
+ */
+ public boolean getBoolean(String key) throws JSONException {
+ Object o = get(key);
+ if (o.equals(Boolean.FALSE) ||
+ (o instanceof String &&
+ ((String)o).equalsIgnoreCase("false"))) {
+ return false;
+ } else if (o.equals(Boolean.TRUE) ||
+ (o instanceof String &&
+ ((String)o).equalsIgnoreCase("true"))) {
+ return true;
+ }
+ throw new JSONException("JSONObject[" + quote(key) +
+ "] is not a Boolean.");
+ }
+
+
+ /**
+ * Get the double value associated with a key.
+ * @param key A key string.
+ * @return The numeric value.
+ * @throws JSONException if the key is not found or
+ * if the value is not a Number object and cannot be converted to a number.
+ */
+ public double getDouble(String key) throws JSONException {
+ Object o = get(key);
+ try {
+ return o instanceof Number ?
+ ((Number)o).doubleValue() :
+ Double.valueOf((String)o).doubleValue();
+ } catch (Exception e) {
+ throw new JSONException("JSONObject[" + quote(key) +
+ "] is not a number.");
+ }
+ }
+
+
+ /**
+ * Get the int value associated with a key. If the number value is too
+ * large for an int, it will be clipped.
+ *
+ * @param key A key string.
+ * @return The integer value.
+ * @throws JSONException if the key is not found or if the value cannot
+ * be converted to an integer.
+ */
+ public int getInt(String key) throws JSONException {
+ Object o = get(key);
+ return o instanceof Number ?
+ ((Number)o).intValue() : (int)getDouble(key);
+ }
+
+
+ /**
+ * Get the JSONArray value associated with a key.
+ *
+ * @param key A key string.
+ * @return A JSONArray which is the value.
+ * @throws JSONException if the key is not found or
+ * if the value is not a JSONArray.
+ */
+ public JSONArray getJSONArray(String key) throws JSONException {
+ Object o = get(key);
+ if (o instanceof JSONArray) {
+ return (JSONArray)o;
+ }
+ throw new JSONException("JSONObject[" + quote(key) +
+ "] is not a JSONArray.");
+ }
+
+
+ /**
+ * Get the JSONObject value associated with a key.
+ *
+ * @param key A key string.
+ * @return A JSONObject which is the value.
+ * @throws JSONException if the key is not found or
+ * if the value is not a JSONObject.
+ */
+ public JSONObject getJSONObject(String key) throws JSONException {
+ Object o = get(key);
+ if (o instanceof JSONObject) {
+ return (JSONObject)o;
+ }
+ throw new JSONException("JSONObject[" + quote(key) +
+ "] is not a JSONObject.");
+ }
+
+
+ /**
+ * Get the long value associated with a key. If the number value is too
+ * long for a long, it will be clipped.
+ *
+ * @param key A key string.
+ * @return The long value.
+ * @throws JSONException if the key is not found or if the value cannot
+ * be converted to a long.
+ */
+ public long getLong(String key) throws JSONException {
+ Object o = get(key);
+ return o instanceof Number ?
+ ((Number)o).longValue() : (long)getDouble(key);
+ }
+
+
+ /**
+ * Get an array of field names from a JSONObject.
+ *
+ * @return An array of field names, or null if there are no names.
+ */
+ public static String[] getNames(JSONObject jo) {
+ int length = jo.length();
+ if (length == 0) {
+ return null;
+ }
+ Iterator i = jo.keys();
+ String[] names = new String[length];
+ int j = 0;
+ while (i.hasNext()) {
+ names[j] = (String)i.next();
+ j += 1;
+ }
+ return names;
+ }
+
+
+ /**
+ * Get an array of field names from an Object.
+ *
+ * @return An array of field names, or null if there are no names.
+ */
+ public static String[] getNames(Object object) {
+ if (object == null) {
+ return null;
+ }
+ Class klass = object.getClass();
+ Field[] fields = klass.getFields();
+ int length = fields.length;
+ if (length == 0) {
+ return null;
+ }
+ String[] names = new String[length];
+ for (int i = 0; i < length; i += 1) {
+ names[i] = fields[i].getName();
+ }
+ return names;
+ }
+
+
+ /**
+ * Get the string associated with a key.
+ *
+ * @param key A key string.
+ * @return A string which is the value.
+ * @throws JSONException if the key is not found.
+ */
+ public String getString(String key) throws JSONException {
+ return get(key).toString();
+ }
+
+
+ /**
+ * Determine if the JSONObject contains a specific key.
+ * @param key A key string.
+ * @return true if the key exists in the JSONObject.
+ */
+ public boolean has(String key) {
+ return this.map.containsKey(key);
+ }
+
+
+ /**
+ * Determine if the value associated with the key is null or if there is
+ * no value.
+ * @param key A key string.
+ * @return true if there is no value associated with the key or if
+ * the value is the JSONObject.NULL object.
+ */
+ public boolean isNull(String key) {
+ return JSONObject.NULL.equals(opt(key));
+ }
+
+
+ /**
+ * Get an enumeration of the keys of the JSONObject.
+ *
+ * @return An iterator of the keys.
+ */
+ public Iterator keys() {
+ return this.map.keySet().iterator();
+ }
+
+
+ /**
+ * Get the number of keys stored in the JSONObject.
+ *
+ * @return The number of keys in the JSONObject.
+ */
+ public int length() {
+ return this.map.size();
+ }
+
+
+ /**
+ * Produce a JSONArray containing the names of the elements of this
+ * JSONObject.
+ * @return A JSONArray containing the key strings, or null if the JSONObject
+ * is empty.
+ */
+ public JSONArray names() {
+ JSONArray ja = new JSONArray();
+ Iterator keys = keys();
+ while (keys.hasNext()) {
+ ja.put(keys.next());
+ }
+ return ja.length() == 0 ? null : ja;
+ }
+
+ /**
+ * Produce a string from a Number.
+ * @param n A Number
+ * @return A String.
+ * @throws JSONException If n is a non-finite number.
+ */
+ static public String numberToString(Number n)
+ throws JSONException {
+ if (n == null) {
+ throw new JSONException("Null pointer");
+ }
+ testValidity(n);
+
+// Shave off trailing zeros and decimal point, if possible.
+
+ String s = n.toString();
+ if (s.indexOf('.') > 0 && s.indexOf('e') < 0 && s.indexOf('E') < 0) {
+ while (s.endsWith("0")) {
+ s = s.substring(0, s.length() - 1);
+ }
+ if (s.endsWith(".")) {
+ s = s.substring(0, s.length() - 1);
+ }
+ }
+ return s;
+ }
+
+
+ /**
+ * Get an optional value associated with a key.
+ * @param key A key string.
+ * @return An object which is the value, or null if there is no value.
+ */
+ public Object opt(String key) {
+ return key == null ? null : this.map.get(key);
+ }
+
+
+ /**
+ * Get an optional boolean associated with a key.
+ * It returns false if there is no such key, or if the value is not
+ * Boolean.TRUE or the String "true".
+ *
+ * @param key A key string.
+ * @return The truth.
+ */
+ public boolean optBoolean(String key) {
+ return optBoolean(key, false);
+ }
+
+
+ /**
+ * Get an optional boolean associated with a key.
+ * It returns the defaultValue if there is no such key, or if it is not
+ * a Boolean or the String "true" or "false" (case insensitive).
+ *
+ * @param key A key string.
+ * @param defaultValue The default.
+ * @return The truth.
+ */
+ public boolean optBoolean(String key, boolean defaultValue) {
+ try {
+ return getBoolean(key);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+
+ /**
+ * Put a key/value pair in the JSONObject, where the value will be a
+ * JSONArray which is produced from a Collection.
+ * @param key A key string.
+ * @param value A Collection value.
+ * @return this.
+ * @throws JSONException
+ */
+ public JSONObject put(String key, Collection value) throws JSONException {
+ put(key, new JSONArray(value));
+ return this;
+ }
+
+
+ /**
+ * Get an optional double associated with a key,
+ * or NaN if there is no such key or if its value is not a number.
+ * If the value is a string, an attempt will be made to evaluate it as
+ * a number.
+ *
+ * @param key A string which is the key.
+ * @return An object which is the value.
+ */
+ public double optDouble(String key) {
+ return optDouble(key, Double.NaN);
+ }
+
+
+ /**
+ * Get an optional double associated with a key, or the
+ * defaultValue if there is no such key or if its value is not a number.
+ * If the value is a string, an attempt will be made to evaluate it as
+ * a number.
+ *
+ * @param key A key string.
+ * @param defaultValue The default.
+ * @return An object which is the value.
+ */
+ public double optDouble(String key, double defaultValue) {
+ try {
+ Object o = opt(key);
+ return o instanceof Number ? ((Number)o).doubleValue() :
+ new Double((String)o).doubleValue();
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+
+ /**
+ * Get an optional int value associated with a key,
+ * or zero if there is no such key or if the value is not a number.
+ * If the value is a string, an attempt will be made to evaluate it as
+ * a number.
+ *
+ * @param key A key string.
+ * @return An object which is the value.
+ */
+ public int optInt(String key) {
+ return optInt(key, 0);
+ }
+
+
+ /**
+ * Get an optional int value associated with a key,
+ * or the default if there is no such key or if the value is not a number.
+ * If the value is a string, an attempt will be made to evaluate it as
+ * a number.
+ *
+ * @param key A key string.
+ * @param defaultValue The default.
+ * @return An object which is the value.
+ */
+ public int optInt(String key, int defaultValue) {
+ try {
+ return getInt(key);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+
+ /**
+ * Get an optional JSONArray associated with a key.
+ * It returns null if there is no such key, or if its value is not a
+ * JSONArray.
+ *
+ * @param key A key string.
+ * @return A JSONArray which is the value.
+ */
+ public JSONArray optJSONArray(String key) {
+ Object o = opt(key);
+ return o instanceof JSONArray ? (JSONArray)o : null;
+ }
+
+
+ /**
+ * Get an optional JSONObject associated with a key.
+ * It returns null if there is no such key, or if its value is not a
+ * JSONObject.
+ *
+ * @param key A key string.
+ * @return A JSONObject which is the value.
+ */
+ public JSONObject optJSONObject(String key) {
+ Object o = opt(key);
+ return o instanceof JSONObject ? (JSONObject)o : null;
+ }
+
+
+ /**
+ * Get an optional long value associated with a key,
+ * or zero if there is no such key or if the value is not a number.
+ * If the value is a string, an attempt will be made to evaluate it as
+ * a number.
+ *
+ * @param key A key string.
+ * @return An object which is the value.
+ */
+ public long optLong(String key) {
+ return optLong(key, 0);
+ }
+
+
+ /**
+ * Get an optional long value associated with a key,
+ * or the default if there is no such key or if the value is not a number.
+ * If the value is a string, an attempt will be made to evaluate it as
+ * a number.
+ *
+ * @param key A key string.
+ * @param defaultValue The default.
+ * @return An object which is the value.
+ */
+ public long optLong(String key, long defaultValue) {
+ try {
+ return getLong(key);
+ } catch (Exception e) {
+ return defaultValue;
+ }
+ }
+
+
+ /**
+ * Get an optional string associated with a key.
+ * It returns an empty string if there is no such key. If the value is not
+ * a string and is not null, then it is coverted to a string.
+ *
+ * @param key A key string.
+ * @return A string which is the value.
+ */
+ public String optString(String key) {
+ return optString(key, "");
+ }
+
+
+ /**
+ * Get an optional string associated with a key.
+ * It returns the defaultValue if there is no such key.
+ *
+ * @param key A key string.
+ * @param defaultValue The default.
+ * @return A string which is the value.
+ */
+ public String optString(String key, String defaultValue) {
+ Object o = opt(key);
+ return o != null ? o.toString() : defaultValue;
+ }
+
+
+ /**
+ * Put a key/boolean pair in the JSONObject.
+ *
+ * @param key A key string.
+ * @param value A boolean which is the value.
+ * @return this.
+ * @throws JSONException If the key is null.
+ */
+ public JSONObject put(String key, boolean value) throws JSONException {
+ put(key, value ? Boolean.TRUE : Boolean.FALSE);
+ return this;
+ }
+
+
+ /**
+ * Put a key/double pair in the JSONObject.
+ *
+ * @param key A key string.
+ * @param value A double which is the value.
+ * @return this.
+ * @throws JSONException If the key is null or if the number is invalid.
+ */
+ public JSONObject put(String key, double value) throws JSONException {
+ put(key, new Double(value));
+ return this;
+ }
+
+
+ /**
+ * Put a key/int pair in the JSONObject.
+ *
+ * @param key A key string.
+ * @param value An int which is the value.
+ * @return this.
+ * @throws JSONException If the key is null.
+ */
+ public JSONObject put(String key, int value) throws JSONException {
+ put(key, new Integer(value));
+ return this;
+ }
+
+
+ /**
+ * Put a key/long pair in the JSONObject.
+ *
+ * @param key A key string.
+ * @param value A long which is the value.
+ * @return this.
+ * @throws JSONException If the key is null.
+ */
+ public JSONObject put(String key, long value) throws JSONException {
+ put(key, new Long(value));
+ return this;
+ }
+
+
+ /**
+ * Put a key/value pair in the JSONObject, where the value will be a
+ * JSONObject which is produced from a Map.
+ * @param key A key string.
+ * @param value A Map value.
+ * @return this.
+ * @throws JSONException
+ */
+ public JSONObject put(String key, Map value) throws JSONException {
+ put(key, new JSONObject(value));
+ return this;
+ }
+
+
+ /**
+ * Put a key/value pair in the JSONObject. If the value is null,
+ * then the key will be removed from the JSONObject if it is present.
+ * @param key A key string.
+ * @param value An object which is the value. It should be of one of these
+ * types: Boolean, Double, Integer, JSONArray, JSONObject, Long, String,
+ * or the JSONObject.NULL object.
+ * @return this.
+ * @throws JSONException If the value is non-finite number
+ * or if the key is null.
+ */
+ public JSONObject put(String key, Object value) throws JSONException {
+ if (key == null) {
+ throw new JSONException("Null key.");
+ }
+ if (value != null) {
+ testValidity(value);
+ this.map.put(key, value);
+ } else {
+ remove(key);
+ }
+ return this;
+ }
+
+
+ /**
+ * Put a key/value pair in the JSONObject, but only if the key and the
+ * value are both non-null, and only if there is not already a member
+ * with that name.
+ * @param key
+ * @param value
+ * @return his.
+ * @throws JSONException if the key is a duplicate
+ */
+ public JSONObject putOnce(String key, Object value) throws JSONException {
+ if (key != null && value != null) {
+ if (opt(key) != null) {
+ throw new JSONException("Duplicate key \"" + key + "\"");
+ }
+ put(key, value);
+ }
+ return this;
+ }
+
+
+ /**
+ * Put a key/value pair in the JSONObject, but only if the
+ * key and the value are both non-null.
+ * @param key A key string.
+ * @param value An object which is the value. It should be of one of these
+ * types: Boolean, Double, Integer, JSONArray, JSONObject, Long, String,
+ * or the JSONObject.NULL object.
+ * @return this.
+ * @throws JSONException If the value is a non-finite number.
+ */
+ public JSONObject putOpt(String key, Object value) throws JSONException {
+ if (key != null && value != null) {
+ put(key, value);
+ }
+ return this;
+ }
+
+
+ /**
+ * Produce a string in double quotes with backslash sequences in all the
+ * right places. A backslash will be inserted within </, allowing JSON
+ * text to be delivered in HTML. In JSON text, a string cannot contain a
+ * control character or an unescaped quote or backslash.
+ * @param string A String
+ * @return A String correctly formatted for insertion in a JSON text.
+ */
+ public static String quote(String string) {
+ if (string == null || string.length() == 0) {
+ return "\"\"";
+ }
+
+ char b;
+ char c = 0;
+ int i;
+ int len = string.length();
+ StringBuffer sb = new StringBuffer(len + 4);
+ String t;
+
+ sb.append('"');
+ for (i = 0; i < len; i += 1) {
+ b = c;
+ c = string.charAt(i);
+ switch (c) {
+ case '\\':
+ case '"':
+ sb.append('\\');
+ sb.append(c);
+ break;
+ case '/':
+ if (b == '<') {
+ sb.append('\\');
+ }
+ sb.append(c);
+ break;
+ case '\b':
+ sb.append("\\b");
+ break;
+ case '\t':
+ sb.append("\\t");
+ break;
+ case '\n':
+ sb.append("\\n");
+ break;
+ case '\f':
+ sb.append("\\f");
+ break;
+ case '\r':
+ sb.append("\\r");
+ break;
+ default:
+ if (c < ' ' || (c >= '\u0080' && c < '\u00a0') ||
+ (c >= '\u2000' && c < '\u2100')) {
+ t = "000" + Integer.toHexString(c);
+ sb.append("\\u" + t.substring(t.length() - 4));
+ } else {
+ sb.append(c);
+ }
+ }
+ }
+ sb.append('"');
+ return sb.toString();
+ }
+
+ /**
+ * Remove a name and its value, if present.
+ * @param key The name to be removed.
+ * @return The value that was associated with the name,
+ * or null if there was no value.
+ */
+ public Object remove(String key) {
+ return this.map.remove(key);
+ }
+
+ /**
+ * Get an enumeration of the keys of the JSONObject.
+ * The keys will be sorted alphabetically.
+ *
+ * @return An iterator of the keys.
+ */
+ public Iterator sortedKeys() {
+ return new TreeSet(this.map.keySet()).iterator();
+ }
+
+ /**
+ * Try to convert a string into a number, boolean, or null. If the string
+ * can't be converted, return the string.
+ * @param s A String.
+ * @return A simple JSON value.
+ */
+ static public Object stringToValue(String s) {
+ if (s.equals("")) {
+ return s;
+ }
+ if (s.equalsIgnoreCase("true")) {
+ return Boolean.TRUE;
+ }
+ if (s.equalsIgnoreCase("false")) {
+ return Boolean.FALSE;
+ }
+ if (s.equalsIgnoreCase("null")) {
+ return JSONObject.NULL;
+ }
+
+ /*
+ * If it might be a number, try converting it. We support the 0- and 0x-
+ * conventions. If a number cannot be produced, then the value will just
+ * be a string. Note that the 0-, 0x-, plus, and implied string
+ * conventions are non-standard. A JSON parser is free to accept
+ * non-JSON forms as long as it accepts all correct JSON forms.
+ */
+
+ char b = s.charAt(0);
+ if ((b >= '0' && b <= '9') || b == '.' || b == '-' || b == '+') {
+ if (b == '0') {
+ if (s.length() > 2 &&
+ (s.charAt(1) == 'x' || s.charAt(1) == 'X')) {
+ try {
+ return new Integer(Integer.parseInt(s.substring(2),
+ 16));
+ } catch (Exception e) {
+ /* Ignore the error */
+ }
+ } else {
+ try {
+ return new Integer(Integer.parseInt(s, 8));
+ } catch (Exception e) {
+ /* Ignore the error */
+ }
+ }
+ }
+ try {
+ if (s.indexOf('.') > -1 || s.indexOf('e') > -1 || s.indexOf('E') > -1) {
+ return Double.valueOf(s);
+ } else {
+ Long myLong = new Long(s);
+ if (myLong.longValue() == myLong.intValue()) {
+ return new Integer(myLong.intValue());
+ } else {
+ return myLong;
+ }
+ }
+ } catch (Exception f) {
+ /* Ignore the error */
+ }
+ }
+ return s;
+ }
+
+
+ /**
+ * Throw an exception if the object is an NaN or infinite number.
+ * @param o The object to test.
+ * @throws JSONException If o is a non-finite number.
+ */
+ static void testValidity(Object o) throws JSONException {
+ if (o != null) {
+ if (o instanceof Double) {
+ if (((Double)o).isInfinite() || ((Double)o).isNaN()) {
+ throw new JSONException(
+ "JSON does not allow non-finite numbers.");
+ }
+ } else if (o instanceof Float) {
+ if (((Float)o).isInfinite() || ((Float)o).isNaN()) {
+ throw new JSONException(
+ "JSON does not allow non-finite numbers.");
+ }
+ }
+ }
+ }
+
+
+ /**
+ * Produce a JSONArray containing the values of the members of this
+ * JSONObject.
+ * @param names A JSONArray containing a list of key strings. This
+ * determines the sequence of the values in the result.
+ * @return A JSONArray of values.
+ * @throws JSONException If any of the values are non-finite numbers.
+ */
+ public JSONArray toJSONArray(JSONArray names) throws JSONException {
+ if (names == null || names.length() == 0) {
+ return null;
+ }
+ JSONArray ja = new JSONArray();
+ for (int i = 0; i < names.length(); i += 1) {
+ ja.put(this.opt(names.getString(i)));
+ }
+ return ja;
+ }
+
+ /**
+ * Make a JSON text of this JSONObject. For compactness, no whitespace
+ * is added. If this would not result in a syntactically correct JSON text,
+ * then null will be returned instead.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return a printable, displayable, portable, transmittable
+ * representation of the object, beginning
+ * with <code>{</code> <small>(left brace)</small> and ending
+ * with <code>}</code> <small>(right brace)</small>.
+ */
+ public String toString() {
+ try {
+ Iterator keys = keys();
+ StringBuffer sb = new StringBuffer("{");
+
+ while (keys.hasNext()) {
+ if (sb.length() > 1) {
+ sb.append(',');
+ }
+ Object o = keys.next();
+ sb.append(quote(o.toString()));
+ sb.append(':');
+ sb.append(valueToString(this.map.get(o)));
+ }
+ sb.append('}');
+ return sb.toString();
+ } catch (Exception e) {
+ return null;
+ }
+ }
+
+
+ /**
+ * Make a prettyprinted JSON text of this JSONObject.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ * @param indentFactor The number of spaces to add to each level of
+ * indentation.
+ * @return a printable, displayable, portable, transmittable
+ * representation of the object, beginning
+ * with <code>{</code> <small>(left brace)</small> and ending
+ * with <code>}</code> <small>(right brace)</small>.
+ * @throws JSONException If the object contains an invalid number.
+ */
+ public String toString(int indentFactor) throws JSONException {
+ return toString(indentFactor, 0);
+ }
+
+
+ /**
+ * Make a prettyprinted JSON text of this JSONObject.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ * @param indentFactor The number of spaces to add to each level of
+ * indentation.
+ * @param indent The indentation of the top level.
+ * @return a printable, displayable, transmittable
+ * representation of the object, beginning
+ * with <code>{</code> <small>(left brace)</small> and ending
+ * with <code>}</code> <small>(right brace)</small>.
+ * @throws JSONException If the object contains an invalid number.
+ */
+ String toString(int indentFactor, int indent) throws JSONException {
+ int j;
+ int n = length();
+ if (n == 0) {
+ return "{}";
+ }
+ Iterator keys = sortedKeys();
+ StringBuffer sb = new StringBuffer("{");
+ int newindent = indent + indentFactor;
+ Object o;
+ if (n == 1) {
+ o = keys.next();
+ sb.append(quote(o.toString()));
+ sb.append(": ");
+ sb.append(valueToString(this.map.get(o), indentFactor,
+ indent));
+ } else {
+ while (keys.hasNext()) {
+ o = keys.next();
+ if (sb.length() > 1) {
+ sb.append(",\n");
+ } else {
+ sb.append('\n');
+ }
+ for (j = 0; j < newindent; j += 1) {
+ sb.append(' ');
+ }
+ sb.append(quote(o.toString()));
+ sb.append(": ");
+ sb.append(valueToString(this.map.get(o), indentFactor,
+ newindent));
+ }
+ if (sb.length() > 1) {
+ sb.append('\n');
+ for (j = 0; j < indent; j += 1) {
+ sb.append(' ');
+ }
+ }
+ }
+ sb.append('}');
+ return sb.toString();
+ }
+
+
+ /**
+ * Make a JSON text of an Object value. If the object has an
+ * value.toJSONString() method, then that method will be used to produce
+ * the JSON text. The method is required to produce a strictly
+ * conforming text. If the object does not contain a toJSONString
+ * method (which is the most common case), then a text will be
+ * produced by other means. If the value is an array or Collection,
+ * then a JSONArray will be made from it and its toJSONString method
+ * will be called. If the value is a MAP, then a JSONObject will be made
+ * from it and its toJSONString method will be called. Otherwise, the
+ * value's toString method will be called, and the result will be quoted.
+ *
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ * @param value The value to be serialized.
+ * @return a printable, displayable, transmittable
+ * representation of the object, beginning
+ * with <code>{</code> <small>(left brace)</small> and ending
+ * with <code>}</code> <small>(right brace)</small>.
+ * @throws JSONException If the value is or contains an invalid number.
+ */
+ static String valueToString(Object value) throws JSONException {
+ if (value == null || value.equals(null)) {
+ return "null";
+ }
+ if (value instanceof JSONString) {
+ Object o;
+ try {
+ o = ((JSONString)value).toJSONString();
+ } catch (Exception e) {
+ throw new JSONException(e);
+ }
+ if (o instanceof String) {
+ return (String)o;
+ }
+ throw new JSONException("Bad value from toJSONString: " + o);
+ }
+ if (value instanceof Number) {
+ return numberToString((Number) value);
+ }
+ if (value instanceof Boolean || value instanceof JSONObject ||
+ value instanceof JSONArray) {
+ return value.toString();
+ }
+ if (value instanceof Map) {
+ return new JSONObject((Map)value).toString();
+ }
+ if (value instanceof Collection) {
+ return new JSONArray((Collection)value).toString();
+ }
+ if (value.getClass().isArray()) {
+ return new JSONArray(value).toString();
+ }
+ return quote(value.toString());
+ }
+
+
+ /**
+ * Make a prettyprinted JSON text of an object value.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ * @param value The value to be serialized.
+ * @param indentFactor The number of spaces to add to each level of
+ * indentation.
+ * @param indent The indentation of the top level.
+ * @return a printable, displayable, transmittable
+ * representation of the object, beginning
+ * with <code>{</code> <small>(left brace)</small> and ending
+ * with <code>}</code> <small>(right brace)</small>.
+ * @throws JSONException If the object contains an invalid number.
+ */
+ static String valueToString(Object value, int indentFactor, int indent)
+ throws JSONException {
+ if (value == null || value.equals(null)) {
+ return "null";
+ }
+ try {
+ if (value instanceof JSONString) {
+ Object o = ((JSONString)value).toJSONString();
+ if (o instanceof String) {
+ return (String)o;
+ }
+ }
+ } catch (Exception e) {
+ /* forget about it */
+ }
+ if (value instanceof Number) {
+ return numberToString((Number) value);
+ }
+ if (value instanceof Boolean) {
+ return value.toString();
+ }
+ if (value instanceof JSONObject) {
+ return ((JSONObject)value).toString(indentFactor, indent);
+ }
+ if (value instanceof JSONArray) {
+ return ((JSONArray)value).toString(indentFactor, indent);
+ }
+ if (value instanceof Map) {
+ return new JSONObject((Map)value).toString(indentFactor, indent);
+ }
+ if (value instanceof Collection) {
+ return new JSONArray((Collection)value).toString(indentFactor, indent);
+ }
+ if (value.getClass().isArray()) {
+ return new JSONArray(value).toString(indentFactor, indent);
+ }
+ return quote(value.toString());
+ }
+
+
+ /**
+ * Write the contents of the JSONObject as JSON text to a writer.
+ * For compactness, no whitespace is added.
+ * <p>
+ * Warning: This method assumes that the data structure is acyclical.
+ *
+ * @return The writer.
+ * @throws JSONException
+ */
+ public Writer write(Writer writer) throws JSONException {
+ try {
+ boolean b = false;
+ Iterator keys = keys();
+ writer.write('{');
+
+ while (keys.hasNext()) {
+ if (b) {
+ writer.write(',');
+ }
+ Object k = keys.next();
+ writer.write(quote(k.toString()));
+ writer.write(':');
+ Object v = this.map.get(k);
+ if (v instanceof JSONObject) {
+ ((JSONObject)v).write(writer);
+ } else if (v instanceof JSONArray) {
+ ((JSONArray)v).write(writer);
+ } else {
+ writer.write(valueToString(v));
+ }
+ b = true;
+ }
+ writer.write('}');
+ return writer;
+ } catch (IOException e) {
+ throw new JSONException(e);
+ }
+ }
+}
\ No newline at end of file
Added: trunk/src/main/org/jboss/messaging/utils/json/JSONString.java
===================================================================
--- trunk/src/main/org/jboss/messaging/utils/json/JSONString.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/utils/json/JSONString.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -0,0 +1,18 @@
+package org.jboss.messaging.utils.json;
+/**
+ * The <code>JSONString</code> interface allows a <code>toJSONString()</code>
+ * method so that a class can change the behavior of
+ * <code>JSONObject.toString()</code>, <code>JSONArray.toString()</code>,
+ * and <code>JSONWriter.value(</code>Object<code>)</code>. The
+ * <code>toJSONString</code> method will be used instead of the default behavior
+ * of using the Object's <code>toString()</code> method and quoting the result.
+ */
+public interface JSONString {
+ /**
+ * The <code>toJSONString</code> method allows a class to produce its own JSON
+ * serialization.
+ *
+ * @return A strictly syntactically correct JSON text.
+ */
+ public String toJSONString();
+}
Added: trunk/src/main/org/jboss/messaging/utils/json/JSONTokener.java
===================================================================
--- trunk/src/main/org/jboss/messaging/utils/json/JSONTokener.java (rev 0)
+++ trunk/src/main/org/jboss/messaging/utils/json/JSONTokener.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -0,0 +1,422 @@
+package org.jboss.messaging.utils.json;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
+
+/*
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/**
+ * A JSONTokener takes a source string and extracts characters and tokens from
+ * it. It is used by the JSONObject and JSONArray constructors to parse
+ * JSON source strings.
+ * @author JSON.org
+ * @version 2008-09-18
+ */
+public class JSONTokener {
+
+ private int index;
+ private Reader reader;
+ private char lastChar;
+ private boolean useLastChar;
+
+
+ /**
+ * Construct a JSONTokener from a string.
+ *
+ * @param reader A reader.
+ */
+ public JSONTokener(Reader reader) {
+ this.reader = reader.markSupported() ?
+ reader : new BufferedReader(reader);
+ this.useLastChar = false;
+ this.index = 0;
+ }
+
+
+ /**
+ * Construct a JSONTokener from a string.
+ *
+ * @param s A source string.
+ */
+ public JSONTokener(String s) {
+ this(new StringReader(s));
+ }
+
+
+ /**
+ * Back up one character. This provides a sort of lookahead capability,
+ * so that you can test for a digit or letter before attempting to parse
+ * the next number or identifier.
+ */
+ public void back() throws JSONException {
+ if (useLastChar || index <= 0) {
+ throw new JSONException("Stepping back two steps is not supported");
+ }
+ index -= 1;
+ useLastChar = true;
+ }
+
+
+
+ /**
+ * Get the hex value of a character (base16).
+ * @param c A character between '0' and '9' or between 'A' and 'F' or
+ * between 'a' and 'f'.
+ * @return An int between 0 and 15, or -1 if c was not a hex digit.
+ */
+ public static int dehexchar(char c) {
+ if (c >= '0' && c <= '9') {
+ return c - '0';
+ }
+ if (c >= 'A' && c <= 'F') {
+ return c - ('A' - 10);
+ }
+ if (c >= 'a' && c <= 'f') {
+ return c - ('a' - 10);
+ }
+ return -1;
+ }
+
+
+ /**
+ * Determine if the source string still contains characters that next()
+ * can consume.
+ * @return true if not yet at the end of the source.
+ */
+ public boolean more() throws JSONException {
+ char nextChar = next();
+ if (nextChar == 0) {
+ return false;
+ }
+ back();
+ return true;
+ }
+
+
+ /**
+ * Get the next character in the source string.
+ *
+ * @return The next character, or 0 if past the end of the source string.
+ */
+ public char next() throws JSONException {
+ if (this.useLastChar) {
+ this.useLastChar = false;
+ if (this.lastChar != 0) {
+ this.index += 1;
+ }
+ return this.lastChar;
+ }
+ int c;
+ try {
+ c = this.reader.read();
+ } catch (IOException exc) {
+ throw new JSONException(exc);
+ }
+
+ if (c <= 0) { // End of stream
+ this.lastChar = 0;
+ return 0;
+ }
+ this.index += 1;
+ this.lastChar = (char) c;
+ return this.lastChar;
+ }
+
+
+ /**
+ * Consume the next character, and check that it matches a specified
+ * character.
+ * @param c The character to match.
+ * @return The character.
+ * @throws JSONException if the character does not match.
+ */
+ public char next(char c) throws JSONException {
+ char n = next();
+ if (n != c) {
+ throw syntaxError("Expected '" + c + "' and instead saw '" +
+ n + "'");
+ }
+ return n;
+ }
+
+
+ /**
+ * Get the next n characters.
+ *
+ * @param n The number of characters to take.
+ * @return A string of n characters.
+ * @throws JSONException
+ * Substring bounds error if there are not
+ * n characters remaining in the source string.
+ */
+ public String next(int n) throws JSONException {
+ if (n == 0) {
+ return "";
+ }
+
+ char[] buffer = new char[n];
+ int pos = 0;
+
+ if (this.useLastChar) {
+ this.useLastChar = false;
+ buffer[0] = this.lastChar;
+ pos = 1;
+ }
+
+ try {
+ int len;
+ while ((pos < n) && ((len = reader.read(buffer, pos, n - pos)) != -1)) {
+ pos += len;
+ }
+ } catch (IOException exc) {
+ throw new JSONException(exc);
+ }
+ this.index += pos;
+
+ if (pos < n) {
+ throw syntaxError("Substring bounds error");
+ }
+
+ this.lastChar = buffer[n - 1];
+ return new String(buffer);
+ }
+
+
+ /**
+ * Get the next char in the string, skipping whitespace.
+ * @throws JSONException
+ * @return A character, or 0 if there are no more characters.
+ */
+ public char nextClean() throws JSONException {
+ for (;;) {
+ char c = next();
+ if (c == 0 || c > ' ') {
+ return c;
+ }
+ }
+ }
+
+
+ /**
+ * Return the characters up to the next close quote character.
+ * Backslash processing is done. The formal JSON format does not
+ * allow strings in single quotes, but an implementation is allowed to
+ * accept them.
+ * @param quote The quoting character, either
+ * <code>"</code> <small>(double quote)</small> or
+ * <code>'</code> <small>(single quote)</small>.
+ * @return A String.
+ * @throws JSONException Unterminated string.
+ */
+ public String nextString(char quote) throws JSONException {
+ char c;
+ StringBuffer sb = new StringBuffer();
+ for (;;) {
+ c = next();
+ switch (c) {
+ case 0:
+ case '\n':
+ case '\r':
+ throw syntaxError("Unterminated string");
+ case '\\':
+ c = next();
+ switch (c) {
+ case 'b':
+ sb.append('\b');
+ break;
+ case 't':
+ sb.append('\t');
+ break;
+ case 'n':
+ sb.append('\n');
+ break;
+ case 'f':
+ sb.append('\f');
+ break;
+ case 'r':
+ sb.append('\r');
+ break;
+ case 'u':
+ sb.append((char)Integer.parseInt(next(4), 16));
+ break;
+ case 'x' :
+ sb.append((char) Integer.parseInt(next(2), 16));
+ break;
+ default:
+ sb.append(c);
+ }
+ break;
+ default:
+ if (c == quote) {
+ return sb.toString();
+ }
+ sb.append(c);
+ }
+ }
+ }
+
+
+ /**
+ * Get the text up but not including the specified character or the
+ * end of line, whichever comes first.
+ * @param d A delimiter character.
+ * @return A string.
+ */
+ public String nextTo(char d) throws JSONException {
+ StringBuffer sb = new StringBuffer();
+ for (;;) {
+ char c = next();
+ if (c == d || c == 0 || c == '\n' || c == '\r') {
+ if (c != 0) {
+ back();
+ }
+ return sb.toString().trim();
+ }
+ sb.append(c);
+ }
+ }
+
+
+ /**
+ * Get the text up but not including one of the specified delimiter
+ * characters or the end of line, whichever comes first.
+ * @param delimiters A set of delimiter characters.
+ * @return A string, trimmed.
+ */
+ public String nextTo(String delimiters) throws JSONException {
+ char c;
+ StringBuffer sb = new StringBuffer();
+ for (;;) {
+ c = next();
+ if (delimiters.indexOf(c) >= 0 || c == 0 ||
+ c == '\n' || c == '\r') {
+ if (c != 0) {
+ back();
+ }
+ return sb.toString().trim();
+ }
+ sb.append(c);
+ }
+ }
+
+
+ /**
+ * Get the next value. The value can be a Boolean, Double, Integer,
+ * JSONArray, JSONObject, Long, or String, or the JSONObject.NULL object.
+ * @throws JSONException If syntax error.
+ *
+ * @return An object.
+ */
+ public Object nextValue() throws JSONException {
+ char c = nextClean();
+ String s;
+
+ switch (c) {
+ case '"':
+ case '\'':
+ return nextString(c);
+ case '{':
+ back();
+ return new JSONObject(this);
+ case '[':
+ case '(':
+ back();
+ return new JSONArray(this);
+ }
+
+ /*
+ * Handle unquoted text. This could be the values true, false, or
+ * null, or it can be a number. An implementation (such as this one)
+ * is allowed to also accept non-standard forms.
+ *
+ * Accumulate characters until we reach the end of the text or a
+ * formatting character.
+ */
+
+ StringBuffer sb = new StringBuffer();
+ while (c >= ' ' && ",:]}/\\\"[{;=#".indexOf(c) < 0) {
+ sb.append(c);
+ c = next();
+ }
+ back();
+
+ s = sb.toString().trim();
+ if (s.equals("")) {
+ throw syntaxError("Missing value");
+ }
+ return JSONObject.stringToValue(s);
+ }
+
+
+ /**
+ * Skip characters until the next character is the requested character.
+ * If the requested character is not found, no characters are skipped.
+ * @param to A character to skip to.
+ * @return The requested character, or zero if the requested character
+ * is not found.
+ */
+ public char skipTo(char to) throws JSONException {
+ char c;
+ try {
+ int startIndex = this.index;
+ reader.mark(Integer.MAX_VALUE);
+ do {
+ c = next();
+ if (c == 0) {
+ reader.reset();
+ this.index = startIndex;
+ return c;
+ }
+ } while (c != to);
+ } catch (IOException exc) {
+ throw new JSONException(exc);
+ }
+
+ back();
+ return c;
+ }
+
+ /**
+ * Make a JSONException to signal a syntax error.
+ *
+ * @param message The error message.
+ * @return A JSONException object, suitable for throwing
+ */
+ public JSONException syntaxError(String message) {
+ return new JSONException(message + toString());
+ }
+
+
+ /**
+ * Make a printable string of this JSONTokener.
+ *
+ * @return " at character [this.index]"
+ */
+ public String toString() {
+ return " at character " + index;
+ }
+}
\ No newline at end of file
Modified: trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java
===================================================================
--- trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/tests/joram-tests/src/org/jboss/test/jms/JBossMessagingAdmin.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -292,6 +292,7 @@
// Private -------------------------------------------------------
private Object invokeSyncOperation(String resourceName, String operationName, Object... parameters)
+ throws Exception
{
ClientMessage message = clientSession.createClientMessage(false);
ManagementHelper.putOperationInvocation(message, resourceName, operationName, parameters);
@@ -314,7 +315,7 @@
" on " +
resourceName +
": " +
- ManagementHelper.getOperationExceptionMessage(reply));
+ ManagementHelper.getResult(reply));
}
return ManagementHelper.getResult(reply);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSMessagingProxy.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSMessagingProxy.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSMessagingProxy.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -23,7 +23,6 @@
package org.jboss.messaging.tests.integration.jms.server.management;
import javax.jms.Message;
-import javax.jms.ObjectMessage;
import javax.jms.Queue;
import javax.jms.QueueRequestor;
import javax.jms.QueueSession;
@@ -76,8 +75,8 @@
{
Message m = session.createMessage();
JMSManagementHelper.putAttribute(m, resourceName, attributeName);
- ObjectMessage reply = (ObjectMessage)requestor.request(m);
- return reply.getObject();
+ Message reply = requestor.request(m);
+ return JMSManagementHelper.getResult(reply);
}
catch (Exception e)
{
@@ -89,14 +88,14 @@
{
Message m = session.createMessage();
JMSManagementHelper.putOperationInvocation(m, resourceName, operationName, args);
- ObjectMessage reply = (ObjectMessage)requestor.request(m);
+ Message reply = requestor.request(m);
if (JMSManagementHelper.hasOperationSucceeded(reply))
{
- return reply.getObject();
+ return JMSManagementHelper.getResult(reply);
}
else
{
- throw new Exception(JMSManagementHelper.getOperationExceptionMessage(reply));
+ throw new Exception((String)JMSManagementHelper.getResult(reply));
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -24,7 +24,7 @@
import static org.jboss.messaging.core.config.impl.ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS;
-import java.util.List;
+import java.util.Map;
import javax.jms.QueueConnection;
import javax.jms.QueueSession;
@@ -37,7 +37,6 @@
import org.jboss.messaging.jms.client.JBossConnectionFactory;
import org.jboss.messaging.jms.server.impl.JMSServerManagerImpl;
import org.jboss.messaging.jms.server.management.JMSServerControlMBean;
-import org.jboss.messaging.utils.Pair;
/**
* A JMSServerControlUsingCoreTest
@@ -93,25 +92,11 @@
return new JMSServerControlMBean()
{
-
public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- List<String> jndiBindings) throws Exception
- {
- proxy.invokeOperation("createConnectionFactory", name, connectorConfigs, jndiBindings);
- }
-
- public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
+ String discoveryAddress,
+ int discoveryPort,
String clientID,
- List<String> jndiBindings) throws Exception
- {
- proxy.invokeOperation("createConnectionFactory", name, connectorConfigs, clientID, jndiBindings);
- }
-
- public void createConnectionFactory(String name,
- List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs,
- String clientID,
+ long discoveryRefreshTimeout,
long pingPeriod,
long connectionTTL,
long callTimeout,
@@ -129,6 +114,7 @@
String loadBalancingPolicyClassName,
int transactionBatchSize,
int dupsOKBatchSize,
+ long initialWaitTimeout,
boolean useGlobalPools,
int scheduledThreadPoolMaxSize,
int threadPoolMaxSize,
@@ -136,11 +122,12 @@
double retryIntervalMultiplier,
int reconnectAttempts,
boolean failoverOnServerShutdown,
- List<String> jndiBindings) throws Exception
+ String[] jndiBindings) throws Exception
{
proxy.invokeOperation("createConnectionFactory",
name,
- connectorConfigs,
+ discoveryAddress,
+ discoveryPort,
clientID,
pingPeriod,
connectionTTL,
@@ -159,6 +146,7 @@
loadBalancingPolicyClassName,
transactionBatchSize,
dupsOKBatchSize,
+ initialWaitTimeout,
useGlobalPools,
scheduledThreadPoolMaxSize,
threadPoolMaxSize,
@@ -173,16 +161,82 @@
String discoveryAddress,
int discoveryPort,
String clientID,
- List<String> jndiBindings) throws Exception
+ String[] jndiBindings) throws Exception
{
- proxy.invokeOperation("createConnectionFactory", name, discoveryAddress, clientID, jndiBindings);
+ proxy.invokeOperation("createConnectionFactory",
+ name,
+ discoveryAddress,
+ discoveryPort,
+ clientID,
+ jndiBindings);
}
public void createConnectionFactory(String name,
- String discoveryAddress,
- int discoveryPort,
+ String liveTransportClassName,
+ Map<String, Object> liveTransportParams,
+ String backupTransportClassName,
+ Map<String, Object> backupTransportParams,
String clientID,
- long discoveryRefreshTimeout,
+ String[] jndiBindings) throws Exception
+ {
+ proxy.invokeOperation("createConnectionFactory",
+ name,
+ liveTransportClassName,
+ liveTransportParams,
+ backupTransportClassName,
+ backupTransportParams,
+ clientID,
+ jndiBindings);
+ }
+
+ public void createConnectionFactory(String name,
+ String liveTransportClassName,
+ Map<String, Object> liveTransportParams,
+ String backupTransportClassName,
+ Map<String, Object> backupTransportParams,
+ String[] jndiBindings) throws Exception
+ {
+ proxy.invokeOperation("createConnectionFactory",
+ name,
+ liveTransportClassName,
+ liveTransportParams,
+ backupTransportClassName,
+ backupTransportParams,
+ jndiBindings);
+ }
+
+ public void createConnectionFactory(String name,
+ String liveTransportClassName,
+ Map<String, Object> liveTransportParams,
+ String clientID,
+ String[] jndiBindings) throws Exception
+ {
+ proxy.invokeOperation("createConnectionFactory",
+ name,
+ liveTransportClassName,
+ liveTransportParams,
+ clientID,
+ jndiBindings);
+ }
+
+ public void createConnectionFactory(String name,
+ String liveTransportClassName,
+ Map<String, Object> liveTransportParams,
+ String[] jndiBindings) throws Exception
+ {
+ proxy.invokeOperation("createConnectionFactory",
+ name,
+ liveTransportClassName,
+ liveTransportParams,
+ jndiBindings);
+ }
+
+ public void createConnectionFactory(String name,
+ String[] liveConnectorsTransportClassNames,
+ Map<String, Object>[] liveConnectorTransportParams,
+ String[] backupConnectorsTransportClassNames,
+ Map<String, Object>[] backupConnectorTransportParams,
+ String clientID,
long pingPeriod,
long connectionTTL,
long callTimeout,
@@ -200,7 +254,6 @@
String loadBalancingPolicyClassName,
int transactionBatchSize,
int dupsOKBatchSize,
- long initialWaitTimeout,
boolean useGlobalPools,
int scheduledThreadPoolMaxSize,
int threadPoolMaxSize,
@@ -208,12 +261,14 @@
double retryIntervalMultiplier,
int reconnectAttempts,
boolean failoverOnServerShutdown,
- List<String> jndiBindings) throws Exception
+ String[] jndiBindings) throws Exception
{
proxy.invokeOperation("createConnectionFactory",
name,
- discoveryAddress,
- discoveryPort,
+ liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams,
clientID,
pingPeriod,
connectionTTL,
@@ -232,7 +287,6 @@
loadBalancingPolicyClassName,
transactionBatchSize,
dupsOKBatchSize,
- initialWaitTimeout,
useGlobalPools,
scheduledThreadPoolMaxSize,
threadPoolMaxSize,
@@ -244,36 +298,40 @@
}
- public void createConnectionFactory(String name, TransportConfiguration liveTC, List<String> jndiBindings) throws Exception
- {
- proxy.invokeOperation("createConnectionFactory", name, liveTC, jndiBindings);
- }
-
public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
+ String[] liveConnectorsTransportClassNames,
+ Map<String, Object>[] liveConnectorTransportParams,
+ String[] backupConnectorsTransportClassNames,
+ Map<String, Object>[] backupConnectorTransportParams,
String clientID,
- List<String> jndiBindings) throws Exception
+ String[] jndiBindings) throws Exception
{
- proxy.invokeOperation("createConnectionFactory", name, liveTC, clientID, jndiBindings);
+ proxy.invokeOperation("createConnectionFactory",
+ name,
+ liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams,
+ clientID,
+ jndiBindings);
}
public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- TransportConfiguration backupTC,
- List<String> jndiBindings) throws Exception
+ String[] liveConnectorsTransportClassNames,
+ Map<String, Object>[] liveConnectorTransportParams,
+ String[] backupConnectorsTransportClassNames,
+ Map<String, Object>[] backupConnectorTransportParams,
+ String[] jndiBindings) throws Exception
{
- proxy.invokeOperation("createConnectionFactory", name, liveTC, backupTC, jndiBindings);
+ proxy.invokeOperation("createConnectionFactory",
+ name,
+ liveConnectorsTransportClassNames,
+ liveConnectorTransportParams,
+ backupConnectorsTransportClassNames,
+ backupConnectorTransportParams,
+ jndiBindings);
}
- public void createConnectionFactory(String name,
- TransportConfiguration liveTC,
- TransportConfiguration backupTC,
- String clientID,
- List<String> jndiBindings) throws Exception
- {
- proxy.invokeOperation("createConnectionFactory", name, liveTC, clientID, backupTC, jndiBindings);
- }
-
public boolean closeConnectionsForAddress(final String ipAddress) throws Exception
{
return (Boolean)proxy.invokeOperation("closeConnectionsForAddress", ipAddress);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/CoreMessagingProxy.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/CoreMessagingProxy.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/CoreMessagingProxy.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -96,7 +96,7 @@
}
else
{
- throw new Exception(ManagementHelper.getOperationExceptionMessage(reply));
+ throw new Exception((String)ManagementHelper.getResult(reply));
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementHelperTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementHelperTest.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementHelperTest.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -22,15 +22,23 @@
package org.jboss.messaging.tests.integration.management;
+import static org.jboss.messaging.tests.util.RandomUtil.randomBoolean;
+import static org.jboss.messaging.tests.util.RandomUtil.randomDouble;
+import static org.jboss.messaging.tests.util.RandomUtil.randomInt;
+import static org.jboss.messaging.tests.util.RandomUtil.randomLong;
import static org.jboss.messaging.tests.util.RandomUtil.randomString;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
import junit.framework.TestCase;
+import org.jboss.messaging.core.buffers.ChannelBuffers;
import org.jboss.messaging.core.client.impl.ClientMessageImpl;
import org.jboss.messaging.core.client.management.impl.ManagementHelper;
+import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.message.Message;
+import org.jboss.messaging.tests.util.RandomUtil;
/**
* A ManagementHelperTest
@@ -44,6 +52,8 @@
// Constants -----------------------------------------------------
+ private static final Logger log = Logger.getLogger(ManagementHelperTest.class);
+
// Attributes ----------------------------------------------------
// Static --------------------------------------------------------
@@ -55,24 +65,144 @@
public void testArrayOfStringParameter() throws Exception
{
String resource = randomString();
- String operationName = randomString();
+ String operationName = randomString();
String param = randomString();
String[] params = new String[] { randomString(), randomString(), randomString() };
- Message msg = new ClientMessageImpl();
+ Message msg = new ClientMessageImpl(false, ChannelBuffers.dynamicBuffer(1024));
ManagementHelper.putOperationInvocation(msg, resource, operationName, param, params);
-
- List<Object> parameters = ManagementHelper.retrieveOperationParameters(msg);
- assertEquals(2, parameters.size());
- assertEquals(param, parameters.get(0));
- Object parameter_2 = parameters.get(1);
- assertTrue(parameter_2 instanceof String[]);
- String[] retrievedParams = (String[])parameter_2;
+
+ Object[] parameters = ManagementHelper.retrieveOperationParameters(msg);
+ assertEquals(2, parameters.length);
+ assertEquals(param, parameters[0]);
+ Object parameter_2 = parameters[1];
+ log.info("type " + parameter_2);
+ assertTrue(parameter_2 instanceof Object[]);
+ Object[] retrievedParams = (Object[])parameter_2;
assertEquals(params.length, retrievedParams.length);
for (int i = 0; i < retrievedParams.length; i++)
{
assertEquals(params[i], retrievedParams[i]);
}
}
+
+ public void testParams() throws Exception
+ {
+ String resource = randomString();
+ String operationName = randomString();
+
+ int i = randomInt();
+ String s = randomString();
+ double d = randomDouble();
+ boolean b = randomBoolean();
+ long l = randomLong();
+ Map<String, Object> map = new HashMap<String, Object>();
+ String key1 = randomString();
+ int value1 = randomInt();
+ String key2 = randomString();
+ double value2 = randomDouble();
+ String key3 = randomString();
+ String value3 = randomString();
+ String key4 = randomString();
+ boolean value4 = randomBoolean();
+ String key5 = randomString();
+ long value5 = randomLong();
+ map.put(key1, value1);
+ map.put(key2, value2);
+ map.put(key3, value3);
+ map.put(key4, value4);
+ map.put(key5, value5);
+
+ Map<String, Object> map2 = new HashMap<String, Object>();
+ String key2_1 = randomString();
+ int value2_1 = randomInt();
+ String key2_2 = randomString();
+ double value2_2 = randomDouble();
+ String key2_3 = randomString();
+ String value2_3 = randomString();
+ String key2_4 = randomString();
+ boolean value2_4 = randomBoolean();
+ String key2_5 = randomString();
+ long value2_5 = randomLong();
+ map2.put(key2_1, value2_1);
+ map2.put(key2_2, value2_2);
+ map2.put(key2_3, value2_3);
+ map2.put(key2_4, value2_4);
+ map2.put(key2_5, value2_5);
+
+ Map<String, Object> map3 = new HashMap<String, Object>();
+ String key3_1 = randomString();
+ int value3_1 = randomInt();
+ String key3_2 = randomString();
+ double value3_2 = randomDouble();
+ String key3_3 = randomString();
+ String value3_3 = randomString();
+ String key3_4 = randomString();
+ boolean value3_4 = randomBoolean();
+ String key3_5 = randomString();
+ long value3_5 = randomLong();
+ map3.put(key3_1, value3_1);
+ map3.put(key3_2, value3_2);
+ map3.put(key3_3, value3_3);
+ map3.put(key3_4, value3_4);
+ map3.put(key3_5, value3_5);
+
+ Map[] maps = new Map[] { map2, map3 };
+
+ String strElem0 = randomString();
+ String strElem1 = randomString();
+ String strElem2 = randomString();
+
+ String[] strArray = new String[] { strElem0, strElem1, strElem2 };
+
+ Object[] params = new Object[] { i, s, d, b, l, map, strArray, maps };
+
+ Message msg = new ClientMessageImpl(false, ChannelBuffers.dynamicBuffer(1024));
+ ManagementHelper.putOperationInvocation(msg, resource, operationName, params);
+
+ Object[] parameters = ManagementHelper.retrieveOperationParameters(msg);
+
+ assertEquals(params.length, parameters.length);
+
+ assertEquals(i, parameters[0]);
+ assertEquals(s, parameters[1]);
+ assertEquals(d, parameters[2]);
+ assertEquals(b, parameters[3]);
+ assertEquals(l, parameters[4]);
+ Map mapRes = (Map)parameters[5];
+ assertEquals(map.size(), mapRes.size());
+ assertEquals(value1, mapRes.get(key1));
+ assertEquals(value2, mapRes.get(key2));
+ assertEquals(value3, mapRes.get(key3));
+ assertEquals(value4, mapRes.get(key4));
+ assertEquals(value5, mapRes.get(key5));
+
+ Object[] strArr2 = (Object[])parameters[6];
+ assertEquals(strArray.length, strArr2.length);
+ assertEquals(strElem0, strArr2[0]);
+ assertEquals(strElem1, strArr2[1]);
+ assertEquals(strElem2, strArr2[2]);
+
+ Object[] mapArray = (Object[])parameters[7];
+ assertEquals(2, mapArray.length);
+ Map mapRes2 = (Map)mapArray[0];
+ assertEquals(map2.size(), mapRes2.size());
+ assertEquals(value2_1, mapRes2.get(key2_1));
+ assertEquals(value2_2, mapRes2.get(key2_2));
+ assertEquals(value2_3, mapRes2.get(key2_3));
+ assertEquals(value2_4, mapRes2.get(key2_4));
+ assertEquals(value2_5, mapRes2.get(key2_5));
+
+ Map mapRes3 = (Map)mapArray[1];
+ assertEquals(map3.size(), mapRes3.size());
+ assertEquals(value3_1, mapRes3.get(key3_1));
+ assertEquals(value3_2, mapRes3.get(key3_2));
+ assertEquals(value3_3, mapRes3.get(key3_3));
+ assertEquals(value3_4, mapRes3.get(key3_4));
+ assertEquals(value3_5, mapRes3.get(key3_5));
+
+
+
+ }
// Package protected ---------------------------------------------
// Protected -----------------------------------------------------
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-05-01 17:53:11 UTC (rev 6647)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/ManagementServiceImplTest.java 2009-05-02 13:35:53 UTC (rev 6648)
@@ -106,7 +106,7 @@
assertFalse(ManagementHelper.hasOperationSucceeded(reply));
- assertNotNull(ManagementHelper.getOperationExceptionMessage(reply));
+ assertNotNull(ManagementHelper.getResult(reply));
server.stop();
}
@@ -130,7 +130,7 @@
assertFalse(ManagementHelper.hasOperationSucceeded(reply));
- assertNotNull(ManagementHelper.getOperationExceptionMessage(reply));
+ assertNotNull(ManagementHelper.getResult(reply));
server.stop();
}
@@ -152,7 +152,7 @@
assertFalse(ManagementHelper.hasOperationSucceeded(reply));
- assertNotNull(ManagementHelper.getOperationExceptionMessage(reply));
+ assertNotNull(ManagementHelper.getResult(reply));
server.stop();
}
// Package protected ---------------------------------------------
More information about the jboss-cvs-commits
mailing list