[jboss-cvs] JBoss Messaging SVN: r3583 - in trunk: src/main/org/jboss/jms/client/delegate and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 17 07:54:12 EST 2008
Author: timfox
Date: 2008-01-17 07:54:12 -0500 (Thu, 17 Jan 2008)
New Revision: 3583
Added:
trunk/tests/src/org/jboss/messaging/test/unit/RandomUtil.java
Removed:
trunk/src/main/org/jboss/jms/tx/MessagingXid.java
trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/RandomUtil.java
Modified:
trunk/src/main/org/jboss/jms/client/api/ClientConnection.java
trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java
trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java
trunk/src/main/org/jboss/jms/tx/TransactionRequest.java
trunk/src/main/org/jboss/messaging/core/PersistenceManager.java
trunk/src/main/org/jboss/messaging/core/remoting/codec/GetPreparedTransactionsResponseCodec.java
trunk/src/main/org/jboss/messaging/core/remoting/wireformat/GetPreparedTransactionsResponse.java
trunk/tests/src/org/jboss/messaging/core/impl/bdbje/integration/test/unit/BDBSpeedTest.java
trunk/tests/src/org/jboss/messaging/core/impl/bdbje/test/unit/BDBJEEnvironmentTestBase.java
trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/CodecAssert.java
trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java
trunk/tests/src/org/jboss/messaging/test/unit/UnitTestCase.java
trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java
trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
trunk/tests/src/org/jboss/test/messaging/jms/XATest.java
trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java
trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCSender.java
Log:
Moved MessagingXid, tidied and added test for it
Modified: trunk/src/main/org/jboss/jms/client/api/ClientConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/api/ClientConnection.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/jms/client/api/ClientConnection.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -16,10 +16,10 @@
import org.jboss.jms.client.Closeable;
import org.jboss.jms.client.JBossConnectionConsumer;
import org.jboss.jms.client.remoting.JMSRemotingConnection;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.ResourceManager;
import org.jboss.jms.tx.TransactionRequest;
import org.jboss.messaging.core.remoting.Client;
+import org.jboss.messaging.core.tx.MessagingXid;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -38,7 +38,6 @@
import org.jboss.jms.client.remoting.ConsolidatedRemotingConnectionListener;
import org.jboss.jms.client.remoting.JMSRemotingConnection;
import org.jboss.jms.destination.JBossDestination;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.ResourceManager;
import org.jboss.jms.tx.ResourceManagerFactory;
import org.jboss.jms.tx.TransactionRequest;
@@ -57,6 +56,7 @@
import org.jboss.messaging.core.remoting.wireformat.SetClientIDMessage;
import org.jboss.messaging.core.remoting.wireformat.StartConnectionMessage;
import org.jboss.messaging.core.remoting.wireformat.StopConnectionMessage;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.messaging.util.ConcurrentHashSet;
import org.jboss.messaging.util.ProxyFactory;
import org.jboss.messaging.util.Version;
Modified: trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/jms/delegate/ConnectionEndpoint.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -25,8 +25,8 @@
import org.jboss.jms.client.Closeable;
import org.jboss.jms.client.api.ClientSession;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.TransactionRequest;
+import org.jboss.messaging.core.tx.MessagingXid;
/**
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -59,7 +59,6 @@
import org.jboss.jms.server.container.SecurityAspect;
import org.jboss.jms.server.security.CheckType;
import org.jboss.jms.tx.ClientTransaction;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.TransactionRequest;
import org.jboss.jms.tx.ClientTransaction.SessionTxState;
import org.jboss.logging.Logger;
@@ -87,6 +86,7 @@
import org.jboss.messaging.core.remoting.wireformat.PacketType;
import org.jboss.messaging.core.remoting.wireformat.SendTransactionMessage;
import org.jboss.messaging.core.remoting.wireformat.SetClientIDMessage;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.messaging.util.ExceptionUtil;
import org.jboss.messaging.util.Util;
Modified: trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -24,6 +24,7 @@
import org.jboss.jms.client.api.ClientSession;
import org.jboss.jms.exception.MessagingXAException;
import org.jboss.logging.Logger;
+import org.jboss.messaging.core.tx.MessagingXid;
import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
Deleted: trunk/src/main/org/jboss/jms/tx/MessagingXid.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/MessagingXid.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/jms/tx/MessagingXid.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -1,211 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jms.tx;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.Serializable;
-
-import javax.transaction.xa.Xid;
-
-import org.jboss.messaging.util.Streamable;
-
-/**
- *
- * Xid implementation
- *
- * @author <a href="mailto:adrian at jboss.org>Adrian Brock</a>
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
- *
- * @version $Revision 1.1 $
- */
-public class MessagingXid implements Xid, Serializable, Streamable
-{
- private static final long serialVersionUID = -1893120702576869245L;
-
- private byte[] branchQualifier;
-
- private int formatId;
-
- private byte[] globalTransactionId;
-
- private int hash;
-
- private boolean hashCalculated;
-
- public byte[] getBranchQualifier()
- {
- return branchQualifier;
- }
-
- public int getFormatId()
- {
- return formatId;
- }
-
- public byte[] getGlobalTransactionId()
- {
- return globalTransactionId;
- }
-
- //For serialization
- public MessagingXid()
- {
- }
-
- public MessagingXid(byte[] branchQualifier, int formatId, byte[] globalTransactionId)
- {
- this.branchQualifier = branchQualifier;
- this.formatId = formatId;
- this.globalTransactionId = globalTransactionId;
- }
-
- //Copy constructor
- public MessagingXid(Xid other)
- {
- this.branchQualifier = copyBytes(other.getBranchQualifier());
- this.formatId = other.getFormatId();
- this.globalTransactionId = copyBytes(other.getGlobalTransactionId());
- }
-
- public int hashCode()
- {
- if (!hashCalculated)
- {
- calcHash();
- }
- return hash;
- }
-
- public boolean equals(Object other)
- {
- if (!(other instanceof Xid))
- {
- return false;
- }
- Xid xother = (Xid)other;
- if (xother.getFormatId() != formatId)
- {
- return false;
- }
- if (xother.getBranchQualifier().length != this.branchQualifier.length)
- {
- return false;
- }
- if (xother.getGlobalTransactionId().length != this.globalTransactionId.length)
- {
- return false;
- }
- for (int i = 0; i < this.branchQualifier.length; i++)
- {
- byte[] otherBQ = xother.getBranchQualifier();
- if (this.branchQualifier[i] != otherBQ[i])
- {
- return false;
- }
- }
- for (int i = 0; i < this.globalTransactionId.length; i++)
- {
- byte[] otherGtx = xother.getGlobalTransactionId();
- if (this.globalTransactionId[i] != otherGtx[i])
- {
- return false;
- }
- }
- return true;
- }
-
- public String toString()
- {
- return "MessagingXid (" + System.identityHashCode(this) + " bq:" + stringRep(branchQualifier) +
- " formatID:" + formatId + " gtxid:" + stringRep(globalTransactionId);
- }
-
- private String stringRep(byte[] bytes)
- {
- StringBuffer buff = new StringBuffer();
- for (int i = 0; i < bytes.length; i++)
- {
- byte b = bytes[i];
-
- buff.append(b);
-
- if (i != bytes.length - 1)
- {
- buff.append('.');
- }
- }
-
- return buff.toString();
- }
-
- public void read(DataInputStream in) throws Exception
- {
- int len = in.readInt();
- branchQualifier = new byte[len];
- in.readFully(branchQualifier);
-
- formatId = in.readInt();
-
- len = in.readInt();
- globalTransactionId = new byte[len];
- in.readFully(globalTransactionId);
- }
-
- public void write(DataOutputStream out) throws Exception
- {
- out.writeInt(branchQualifier.length);
- out.write(branchQualifier);
-
- out.writeInt(formatId);
-
- out.writeInt(globalTransactionId.length);
- out.write(globalTransactionId);
- }
-
- private void calcHash()
- {
- byte[] hashBytes = new byte[branchQualifier.length + globalTransactionId.length + 4];
- System.arraycopy(branchQualifier, 0, hashBytes, 0, branchQualifier.length);
- System.arraycopy(globalTransactionId, 0, hashBytes, branchQualifier.length, globalTransactionId.length);
- byte[] intBytes = new byte[4];
- for (int i = 0; i < 4; i++)
- {
- intBytes[i] = (byte)((formatId >> (i * 8)) % 0xFF);
- }
- System.arraycopy(intBytes, 0, hashBytes, branchQualifier.length + globalTransactionId.length, 4);
- String s = new String(hashBytes);
- hash = s.hashCode();
- hashCalculated = true;
- }
-
- private byte[] copyBytes(byte[] other)
- {
- byte[] bytes = new byte[other.length];
-
- System.arraycopy(other, 0, bytes, 0, other.length);
-
- return bytes;
- }
-
-}
Modified: trunk/src/main/org/jboss/jms/tx/TransactionRequest.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/TransactionRequest.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/jms/tx/TransactionRequest.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -26,6 +26,7 @@
import javax.transaction.xa.Xid;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.messaging.util.Streamable;
/**
Modified: trunk/src/main/org/jboss/messaging/core/PersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/PersistenceManager.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/messaging/core/PersistenceManager.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -25,7 +25,7 @@
import javax.transaction.xa.Xid;
-import org.jboss.jms.tx.MessagingXid;
+import org.jboss.messaging.core.tx.MessagingXid;
/**
*
Modified: trunk/src/main/org/jboss/messaging/core/remoting/codec/GetPreparedTransactionsResponseCodec.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/codec/GetPreparedTransactionsResponseCodec.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/messaging/core/remoting/codec/GetPreparedTransactionsResponseCodec.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -13,8 +13,8 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.messaging.core.remoting.wireformat.GetPreparedTransactionsResponse;
+import org.jboss.messaging.core.tx.MessagingXid;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>.
Modified: trunk/src/main/org/jboss/messaging/core/remoting/wireformat/GetPreparedTransactionsResponse.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/wireformat/GetPreparedTransactionsResponse.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/src/main/org/jboss/messaging/core/remoting/wireformat/GetPreparedTransactionsResponse.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -10,7 +10,7 @@
import java.util.Arrays;
-import org.jboss.jms.tx.MessagingXid;
+import org.jboss.messaging.core.tx.MessagingXid;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/tests/src/org/jboss/messaging/core/impl/bdbje/integration/test/unit/BDBSpeedTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/impl/bdbje/integration/test/unit/BDBSpeedTest.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/messaging/core/impl/bdbje/integration/test/unit/BDBSpeedTest.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -27,13 +27,13 @@
import javax.transaction.xa.Xid;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.Queue;
import org.jboss.messaging.core.impl.MessageImpl;
import org.jboss.messaging.core.impl.QueueImpl;
import org.jboss.messaging.core.impl.bdbje.BDBJEPersistenceManager;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.messaging.test.unit.UnitTestCase;
/**
Modified: trunk/tests/src/org/jboss/messaging/core/impl/bdbje/test/unit/BDBJEEnvironmentTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/impl/bdbje/test/unit/BDBJEEnvironmentTestBase.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/messaging/core/impl/bdbje/test/unit/BDBJEEnvironmentTestBase.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -26,10 +26,10 @@
import javax.transaction.xa.Xid;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.messaging.core.impl.bdbje.BDBJEDatabase;
import org.jboss.messaging.core.impl.bdbje.BDBJEEnvironment;
import org.jboss.messaging.core.impl.bdbje.BDBJETransaction;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.messaging.test.unit.UnitTestCase;
import com.sleepycat.je.DatabaseException;
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/CodecAssert.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/CodecAssert.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/CodecAssert.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -15,7 +15,7 @@
import org.jboss.jms.delegate.Cancel;
import org.jboss.jms.delegate.DeliveryRecovery;
import org.jboss.jms.delegate.TopologyResult;
-import org.jboss.jms.tx.MessagingXid;
+import org.jboss.messaging.core.tx.MessagingXid;
/**
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/PacketTypeTest.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -68,11 +68,11 @@
import static org.jboss.messaging.core.remoting.wireformat.test.unit.CodecAssert.assertEqualsCancels;
import static org.jboss.messaging.core.remoting.wireformat.test.unit.CodecAssert.assertSameTopology;
import static org.jboss.messaging.core.remoting.wireformat.test.unit.CodecAssert.assertSameXids;
-import static org.jboss.messaging.core.remoting.wireformat.test.unit.RandomUtil.randomByte;
-import static org.jboss.messaging.core.remoting.wireformat.test.unit.RandomUtil.randomBytes;
-import static org.jboss.messaging.core.remoting.wireformat.test.unit.RandomUtil.randomInt;
-import static org.jboss.messaging.core.remoting.wireformat.test.unit.RandomUtil.randomLong;
-import static org.jboss.messaging.core.remoting.wireformat.test.unit.RandomUtil.randomString;
+import static org.jboss.messaging.test.unit.RandomUtil.randomByte;
+import static org.jboss.messaging.test.unit.RandomUtil.randomBytes;
+import static org.jboss.messaging.test.unit.RandomUtil.randomInt;
+import static org.jboss.messaging.test.unit.RandomUtil.randomLong;
+import static org.jboss.messaging.test.unit.RandomUtil.randomString;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -97,7 +97,6 @@
import org.jboss.jms.destination.JBossQueue;
import org.jboss.jms.destination.JBossTopic;
import org.jboss.jms.tx.ClientTransaction;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.TransactionRequest;
import org.jboss.messaging.core.Destination;
import org.jboss.messaging.core.DestinationType;
@@ -189,6 +188,7 @@
import org.jboss.messaging.core.remoting.wireformat.TextPacket;
import org.jboss.messaging.core.remoting.wireformat.UnsubscribeMessage;
import org.jboss.messaging.core.remoting.wireformat.UpdateCallbackMessage;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.messaging.util.Version;
/**
Deleted: trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/RandomUtil.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/RandomUtil.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/RandomUtil.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -1,65 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-package org.jboss.messaging.core.remoting.wireformat.test.unit;
-
-import static java.util.UUID.randomUUID;
-
-import java.util.Random;
-
-/**
- * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
- *
- * @version <tt>$Revision$</tt>
- *
- */
-public class RandomUtil
-{
- // Constants -----------------------------------------------------
-
- private static final Random random = new Random(System.currentTimeMillis());
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- static String randomString()
- {
- return randomUUID().toString();
- }
-
- static long randomLong()
- {
- return random.nextLong();
- }
-
- static int randomInt()
- {
- return random.nextInt();
- }
-
- static byte randomByte()
- {
- return Integer.valueOf(random.nextInt()).byteValue();
- }
-
- static byte[] randomBytes()
- {
- return randomString().getBytes();
- }
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-}
Copied: trunk/tests/src/org/jboss/messaging/test/unit/RandomUtil.java (from rev 3581, trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/RandomUtil.java)
===================================================================
--- trunk/tests/src/org/jboss/messaging/test/unit/RandomUtil.java (rev 0)
+++ trunk/tests/src/org/jboss/messaging/test/unit/RandomUtil.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.messaging.test.unit;
+
+import static java.util.UUID.randomUUID;
+
+import java.util.Random;
+
+/**
+ * @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
+ *
+ * @version <tt>$Revision$</tt>
+ *
+ */
+public class RandomUtil
+{
+ // Constants -----------------------------------------------------
+
+ private static final Random random = new Random(System.currentTimeMillis());
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ public static String randomString()
+ {
+ return randomUUID().toString();
+ }
+
+ public static long randomLong()
+ {
+ return random.nextLong();
+ }
+
+ public static int randomInt()
+ {
+ return random.nextInt();
+ }
+
+ public static byte randomByte()
+ {
+ return Integer.valueOf(random.nextInt()).byteValue();
+ }
+
+ public static byte[] randomBytes()
+ {
+ return randomString().getBytes();
+ }
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+}
Modified: trunk/tests/src/org/jboss/messaging/test/unit/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/test/unit/UnitTestCase.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/messaging/test/unit/UnitTestCase.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -36,11 +36,11 @@
import junit.framework.TestCase;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.Queue;
import org.jboss.messaging.core.impl.MessageImpl;
+import org.jboss.messaging.core.tx.MessagingXid;
/**
*
Modified: trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -39,8 +39,8 @@
import org.jboss.jms.exception.MessagingXAException;
import org.jboss.jms.server.security.Role;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.logging.Logger;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.messaging.util.XMLUtil;
import org.jboss.test.messaging.tools.ServerManagement;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -23,8 +23,8 @@
import com.arjuna.ats.arjuna.common.Uid;
import com.arjuna.ats.jta.xa.XidImple;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.ResourceManagerFactory;
+import org.jboss.messaging.core.tx.MessagingXid;
import javax.jms.*;
import javax.transaction.xa.XAResource;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/XATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/XATest.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/test/messaging/jms/XATest.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -50,10 +50,10 @@
import org.jboss.jms.client.delegate.ClientConnectionDelegate;
import org.jboss.jms.tx.LocalTx;
import org.jboss.jms.tx.MessagingXAResource;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.ResourceManager;
import org.jboss.jms.tx.ResourceManagerFactory;
import org.jboss.logging.Logger;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.messaging.util.ProxyFactory;
import org.jboss.test.messaging.JBMServerTestCase;
import org.jboss.test.messaging.tools.ServerManagement;
Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/connectionmanager/SimpleConnectionManagerTest.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -36,9 +36,9 @@
import org.jboss.jms.delegate.SessionDelegate;
import org.jboss.jms.server.ConnectionManager;
import org.jboss.jms.server.connectionmanager.SimpleConnectionManager;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.jms.tx.TransactionRequest;
import org.jboss.messaging.core.impl.server.MessagingServerImpl;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.test.messaging.jms.JMSTestCase;
/**
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCReceiver.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -26,8 +26,8 @@
import javax.jms.XASession;
import javax.transaction.xa.XAResource;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.logging.Logger;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.util.id.GUID;
/**
Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCSender.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCSender.java 2008-01-17 12:00:21 UTC (rev 3582)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/Transactional2PCSender.java 2008-01-17 12:54:12 UTC (rev 3583)
@@ -26,8 +26,8 @@
import javax.jms.XASession;
import javax.transaction.xa.XAResource;
-import org.jboss.jms.tx.MessagingXid;
import org.jboss.logging.Logger;
+import org.jboss.messaging.core.tx.MessagingXid;
import org.jboss.util.id.GUID;
/**
More information about the jboss-cvs-commits
mailing list