JBoss hornetq SVN: r10643 - in trunk/tests/joram-tests: src/test and 2 other directories.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-12 09:02:52 -0400 (Thu, 12 May 2011)
New Revision: 10643
Added:
trunk/tests/joram-tests/src/test/resources/
trunk/tests/joram-tests/src/test/resources/provider.properties
trunk/tests/joram-tests/src/test/resources/test.properties
Removed:
trunk/tests/joram-tests/config/provider.properties
trunk/tests/joram-tests/config/test.properties
Modified:
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java
Log:
Fix ObjectWeb Joram tests set-up
Deleted: trunk/tests/joram-tests/config/provider.properties
===================================================================
--- trunk/tests/joram-tests/config/provider.properties 2011-05-12 13:01:53 UTC (rev 10642)
+++ trunk/tests/joram-tests/config/provider.properties 2011-05-12 13:02:52 UTC (rev 10643)
@@ -1,36 +0,0 @@
-##
-# JORAM: Java(TM) Open Reliable Asynchronous Messaging
-# Copyright (C) 2002 INRIA
-# Contact: joram-team(a)objectweb.org
-#
-# This library 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 any later version.
-#
-# This library 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 library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-# Initial developer(s): Jeff Mesnil (jmesnil(a)inrialpes.fr)
-# Contributor(s): ______________________________________.
-##
-
-##
-# This property is used to chose which provider is to be tested
-# Uncomment the chosen provider and comment the other ones
-##
-
-jms.provider.admin.class=org.hornetq.jms.HornetQAdmin
-#jms.provider.admin.class = org.hornetq.api.jms.GenericAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.FioranoMQAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.PramatiAdmin
-#jms.provider.admin.class = org.objectweb.jtests.providers.admin.SwiftMQAdmin
\ No newline at end of file
Deleted: trunk/tests/joram-tests/config/test.properties
===================================================================
--- trunk/tests/joram-tests/config/test.properties 2011-05-12 13:01:53 UTC (rev 10642)
+++ trunk/tests/joram-tests/config/test.properties 2011-05-12 13:02:52 UTC (rev 10643)
@@ -1,29 +0,0 @@
-##
-# JORAM: Java(TM) Open Reliable Asynchronous Messaging
-# Copyright (C) 2002 INRIA
-# Contact: joram-team(a)objectweb.org
-#
-# This library 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 any later version.
-#
-# This library 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 library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
-#
-# Initial developer(s): Jeff Mesnil (jmesnil(a)inrialpes.fr)
-# Contributor(s): ______________________________________.
-##
-
-# Timeout specified for receive(long time) method
-# Time in milliseconds or 0 for never expiring
-# Default is set to 30 seconds (long enough to receive slow messages
-# and won't hang up tests infinitely)
-timeout = 30000
\ No newline at end of file
Modified: trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java
===================================================================
--- trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2011-05-12 13:01:53 UTC (rev 10642)
+++ trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/JMSTestCase.java 2011-05-12 13:02:52 UTC (rev 10643)
@@ -35,7 +35,7 @@
*/
public abstract class JMSTestCase extends TestCase
{
- private static final String PROP_FILE_NAME = "config/provider.properties";
+ private static final String PROP_FILE_NAME = "provider.properties";
protected Admin admin;
@@ -57,11 +57,11 @@
{
message += " [linked exception: " + linkedException + "]";
}
- super.fail(message);
+ fail(message);
}
else
{
- super.fail(e.getMessage());
+ fail(e.getMessage());
}
}
Modified: trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java
===================================================================
--- trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java 2011-05-12 13:01:53 UTC (rev 10642)
+++ trunk/tests/joram-tests/src/test/java/org/objectweb/jtests/jms/framework/TestConfig.java 2011-05-12 13:02:52 UTC (rev 10643)
@@ -24,13 +24,13 @@
public class TestConfig
{
// name of the configuration file
- private static final String PROP_FILE_NAME = "config/test.properties";
+ private static final String PROP_FILE_NAME = "test.properties";
// name of the timeout property
private static final String PROP_NAME = "timeout";
/**
- * timeout value used by <code>receive</code> method in the tests.
+ * timeout value used by <code>receive</code> method in the tests.
* the value is specified in the <code>config/test.properties</code> file.
*/
public static final long TIMEOUT;
Copied: trunk/tests/joram-tests/src/test/resources/provider.properties (from rev 10642, trunk/tests/joram-tests/config/provider.properties)
===================================================================
--- trunk/tests/joram-tests/src/test/resources/provider.properties (rev 0)
+++ trunk/tests/joram-tests/src/test/resources/provider.properties 2011-05-12 13:02:52 UTC (rev 10643)
@@ -0,0 +1,36 @@
+##
+# JORAM: Java(TM) Open Reliable Asynchronous Messaging
+# Copyright (C) 2002 INRIA
+# Contact: joram-team(a)objectweb.org
+#
+# This library 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 any later version.
+#
+# This library 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 library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+# Initial developer(s): Jeff Mesnil (jmesnil(a)inrialpes.fr)
+# Contributor(s): ______________________________________.
+##
+
+##
+# This property is used to chose which provider is to be tested
+# Uncomment the chosen provider and comment the other ones
+##
+
+jms.provider.admin.class=org.hornetq.jms.HornetQAdmin
+#jms.provider.admin.class = org.hornetq.api.jms.GenericAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.FioranoMQAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.PramatiAdmin
+#jms.provider.admin.class = org.objectweb.jtests.providers.admin.SwiftMQAdmin
\ No newline at end of file
Copied: trunk/tests/joram-tests/src/test/resources/test.properties (from rev 10642, trunk/tests/joram-tests/config/test.properties)
===================================================================
--- trunk/tests/joram-tests/src/test/resources/test.properties (rev 0)
+++ trunk/tests/joram-tests/src/test/resources/test.properties 2011-05-12 13:02:52 UTC (rev 10643)
@@ -0,0 +1,29 @@
+##
+# JORAM: Java(TM) Open Reliable Asynchronous Messaging
+# Copyright (C) 2002 INRIA
+# Contact: joram-team(a)objectweb.org
+#
+# This library 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 any later version.
+#
+# This library 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 library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+# Initial developer(s): Jeff Mesnil (jmesnil(a)inrialpes.fr)
+# Contributor(s): ______________________________________.
+##
+
+# Timeout specified for receive(long time) method
+# Time in milliseconds or 0 for never expiring
+# Default is set to 30 seconds (long enough to receive slow messages
+# and won't hang up tests infinitely)
+timeout = 30000
\ No newline at end of file
14 years, 12 months
JBoss hornetq SVN: r10642 - trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-12 09:01:53 -0400 (Thu, 12 May 2011)
New Revision: 10642
Modified:
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageImpl.java
trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
Log:
Fix loads of silly warnings
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageImpl.java 2011-05-12 12:05:27 UTC (rev 10641)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientLargeMessageImpl.java 2011-05-12 13:01:53 UTC (rev 10642)
@@ -27,8 +27,6 @@
* until the buffer is filled up or the user set a streaming.
*
* @author clebertsuconic
- *
- *
*/
public class ClientLargeMessageImpl extends ClientMessageImpl implements ClientLargeMessageInternal
{
@@ -49,6 +47,7 @@
/**
* @return the largeMessageSize
*/
+ @Override
public long getLargeMessageSize()
{
return largeMessageSize;
@@ -57,6 +56,7 @@
/**
* @param largeMessageSize the largeMessageSize to set
*/
+ @Override
public void setLargeMessageSize(long largeMessageSize)
{
this.largeMessageSize = largeMessageSize;
@@ -70,6 +70,7 @@
// Public --------------------------------------------------------
+ @Override
public int getEncodeSize()
{
if (bodyBuffer != null)
@@ -85,16 +86,19 @@
/**
* @return the largeMessage
*/
+ @Override
public boolean isLargeMessage()
{
return true;
}
+ @Override
public void setLargeMessageController(final LargeMessageController controller)
{
largeMessageController = controller;
}
+ @Override
public HornetQBuffer getBodyBuffer()
{
checkBuffer();
@@ -102,11 +106,13 @@
return bodyBuffer;
}
+ @Override
public int getBodySize()
{
return getLongProperty(Message.HDR_LARGE_BODY_SIZE).intValue();
}
+ @Override
public LargeMessageController getLargeMessageController()
{
return largeMessageController;
@@ -115,6 +121,7 @@
/* (non-Javadoc)
* @see org.hornetq.api.core.client.ClientMessage#saveToOutputStream(java.io.OutputStream)
*/
+ @Override
public void saveToOutputStream(final OutputStream out) throws HornetQException
{
if (bodyBuffer != null)
@@ -131,6 +138,7 @@
/* (non-Javadoc)
* @see org.hornetq.api.core.client.ClientMessage#setOutputStream(java.io.OutputStream)
*/
+ @Override
public void setOutputStream(final OutputStream out) throws HornetQException
{
if (bodyBuffer != null)
@@ -146,6 +154,7 @@
/* (non-Javadoc)
* @see org.hornetq.api.core.client.ClientMessage#waitOutputStreamCompletion()
*/
+ @Override
public boolean waitOutputStreamCompletion(final long timeMilliseconds) throws HornetQException
{
if (bodyBuffer != null)
@@ -158,6 +167,7 @@
}
}
+ @Override
public void discardBody()
{
if (bodyBuffer != null)
Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-05-12 12:05:27 UTC (rev 10641)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-05-12 13:01:53 UTC (rev 10642)
@@ -17,7 +17,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -29,9 +28,12 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
-import org.hornetq.api.core.*;
+import org.hornetq.api.core.HornetQBuffer;
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.Interceptor;
+import org.hornetq.api.core.SimpleString;
+import org.hornetq.api.core.TransportConfiguration;
import org.hornetq.api.core.client.ClientSession;
-import org.hornetq.api.core.client.HornetQClient;
import org.hornetq.api.core.client.ServerLocator;
import org.hornetq.api.core.client.SessionFailureListener;
import org.hornetq.core.logging.Logger;
@@ -203,6 +205,7 @@
}
+ @Override
public void connect(int initialConnectAttempts, boolean failoverOnInitialConnection) throws HornetQException
{
// Get the connection
@@ -221,11 +224,13 @@
}
+ @Override
public TransportConfiguration getConnectorConfiguration()
{
return connectorConfig;
}
+ @Override
public void setBackupConnector(TransportConfiguration live, TransportConfiguration backUp)
{
if(live.equals(connectorConfig) && backUp != null)
@@ -234,11 +239,13 @@
}
}
+ @Override
public Object getBackupConnector()
{
return backupConfig;
}
+ @Override
public ClientSession createSession(final String username,
final String password,
final boolean xa,
@@ -256,6 +263,7 @@
ackBatchSize);
}
+ @Override
public ClientSession createSession(final boolean autoCommitSends,
final boolean autoCommitAcks,
final int ackBatchSize) throws HornetQException
@@ -269,6 +277,7 @@
ackBatchSize);
}
+ @Override
public ClientSession createXASession() throws HornetQException
{
return createSessionInternal(null,
@@ -280,6 +289,7 @@
serverLocator.getAckBatchSize());
}
+ @Override
public ClientSession createTransactedSession() throws HornetQException
{
return createSessionInternal(null,
@@ -291,6 +301,7 @@
serverLocator.getAckBatchSize());
}
+ @Override
public ClientSession createSession() throws HornetQException
{
return createSessionInternal(null,
@@ -302,6 +313,7 @@
serverLocator.getAckBatchSize());
}
+ @Override
public ClientSession createSession(final boolean autoCommitSends, final boolean autoCommitAcks) throws HornetQException
{
return createSessionInternal(null,
@@ -313,6 +325,7 @@
serverLocator.getAckBatchSize());
}
+ @Override
public ClientSession createSession(final boolean xa, final boolean autoCommitSends, final boolean autoCommitAcks) throws HornetQException
{
return createSessionInternal(null,
@@ -324,6 +337,7 @@
serverLocator.getAckBatchSize());
}
+ @Override
public ClientSession createSession(final boolean xa,
final boolean autoCommitSends,
final boolean autoCommitAcks,
@@ -340,16 +354,19 @@
// ConnectionLifeCycleListener implementation --------------------------------------------------
+ @Override
public void connectionCreated(final Connection connection, final ProtocolType protocol)
{
}
+ @Override
public void connectionDestroyed(final Object connectionID)
{
handleConnectionFailure(connectionID,
new HornetQException(HornetQException.NOT_CONNECTED, "Channel disconnected"));
}
+ @Override
public void connectionException(final Object connectionID, final HornetQException me)
{
handleConnectionFailure(connectionID, me);
@@ -357,6 +374,7 @@
// Must be synchronized to prevent it happening concurrently with failover which can lead to
// inconsistencies
+ @Override
public void removeSession(final ClientSessionInternal session, boolean failingOver)
{
synchronized (sessions)
@@ -365,30 +383,36 @@
}
}
+ @Override
public void connectionReadyForWrites(final Object connectionID, final boolean ready)
{
}
+ @Override
public synchronized int numConnections()
{
return connection != null ? 1 : 0;
}
+ @Override
public int numSessions()
{
return sessions.size();
}
+ @Override
public void addFailureListener(final SessionFailureListener listener)
{
listeners.add(listener);
}
+ @Override
public boolean removeFailureListener(final SessionFailureListener listener)
{
return listeners.remove(listener);
}
+ @Override
public void causeExit()
{
exitLoop = true;
@@ -398,6 +422,7 @@
}
}
+ @Override
public void close()
{
if (closed)
@@ -436,6 +461,7 @@
closed = true;
}
+ @Override
public ServerLocator getServerLocator()
{
return serverLocator;
@@ -968,6 +994,7 @@
}
}
+ @Override
public CoreRemotingConnection getConnection()
{
if (connection == null)
@@ -1128,6 +1155,7 @@
return connection;
}
+ @Override
public void finalize() throws Throwable
{
if (!closed)
@@ -1147,6 +1175,7 @@
{
return AccessController.doPrivileged(new PrivilegedAction<ConnectorFactory>()
{
+ @Override
public ConnectorFactory run()
{
ClassLoader loader = Thread.currentThread().getContextClassLoader();
@@ -1212,6 +1241,7 @@
this.conn = conn;
}
+ @Override
public void handlePacket(final Packet packet)
{
final byte type = packet.getType();
@@ -1224,6 +1254,7 @@
{
// Must be executed on new thread since cannot block the netty thread for a long time and fail can
// cause reconnect loop
+ @Override
public void run()
{
SimpleString nodeID = msg.getNodeID();
@@ -1258,6 +1289,7 @@
private class DelegatingBufferHandler implements BufferHandler
{
+ @Override
public void bufferReceived(final Object connectionID, final HornetQBuffer buffer)
{
CoreRemotingConnection theConn = connection;
@@ -1278,6 +1310,7 @@
this.connectionID = connectionID;
}
+ @Override
public void connectionFailed(final HornetQException me, boolean failedOver)
{
handleConnectionFailure(connectionID, me);
@@ -1293,6 +1326,7 @@
pingRunnable = new WeakReference<PingRunnable>(runnable);
}
+ @Override
public void run()
{
PingRunnable runnable = pingRunnable.get();
@@ -1313,6 +1347,7 @@
private long lastCheck = System.currentTimeMillis();
+ @Override
public synchronized void run()
{
if (cancelled || stopPingingAfterOne && !first)
@@ -1336,6 +1371,7 @@
threadPool.execute(new Runnable()
{
// Must be executed on different thread
+ @Override
public void run()
{
connection.fail(me);
14 years, 12 months
JBoss hornetq SVN: r10641 - in branches/Branch_2_2_2_REST: examples/dup-send and 4 other directories.
by do-not-reply＠jboss.org
Author: bill.burke(a)jboss.com
Date: 2011-05-12 08:05:27 -0400 (Thu, 12 May 2011)
New Revision: 10641
Modified:
branches/Branch_2_2_2_REST/examples/dup-send/pom.xml
branches/Branch_2_2_2_REST/examples/javascript-chat/pom.xml
branches/Branch_2_2_2_REST/examples/jms-to-rest/pom.xml
branches/Branch_2_2_2_REST/examples/push/pom.xml
branches/Branch_2_2_2_REST/hornetq-rest/pom.xml
branches/Branch_2_2_2_REST/pom.xml
Log:
Modified: branches/Branch_2_2_2_REST/examples/dup-send/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/examples/dup-send/pom.xml 2011-05-12 11:27:50 UTC (rev 10640)
+++ branches/Branch_2_2_2_REST/examples/dup-send/pom.xml 2011-05-12 12:05:27 UTC (rev 10641)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>dup-send</artifactId>
- <version>2.2.2.1</version>
+ <version>2.2.2.2</version>
<packaging>war</packaging>
<properties>
<resteasy.version>2.1.0.GA</resteasy.version>
Modified: branches/Branch_2_2_2_REST/examples/javascript-chat/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/examples/javascript-chat/pom.xml 2011-05-12 11:27:50 UTC (rev 10640)
+++ branches/Branch_2_2_2_REST/examples/javascript-chat/pom.xml 2011-05-12 12:05:27 UTC (rev 10641)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>javascript-chat</artifactId>
- <version>2.2.2.1</version>
+ <version>2.2.2.2</version>
<packaging>war</packaging>
<properties>
<resteasy.version>2.0.1.GA</resteasy.version>
Modified: branches/Branch_2_2_2_REST/examples/jms-to-rest/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/examples/jms-to-rest/pom.xml 2011-05-12 11:27:50 UTC (rev 10640)
+++ branches/Branch_2_2_2_REST/examples/jms-to-rest/pom.xml 2011-05-12 12:05:27 UTC (rev 10641)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>mixed-jms-rest</artifactId>
- <version>2.2.2.1</version>
+ <version>2.2.2.2</version>
<packaging>war</packaging>
<properties>
<resteasy.version>2.1.0.GA</resteasy.version>
Modified: branches/Branch_2_2_2_REST/examples/push/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/examples/push/pom.xml 2011-05-12 11:27:50 UTC (rev 10640)
+++ branches/Branch_2_2_2_REST/examples/push/pom.xml 2011-05-12 12:05:27 UTC (rev 10641)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.hornetq.rest.examples</groupId>
<artifactId>push</artifactId>
- <version>2.2.2.1</version>
+ <version>2.2.2.2</version>
<packaging>war</packaging>
<properties>
<resteasy.version>2.1.0.GA</resteasy.version>
Modified: branches/Branch_2_2_2_REST/hornetq-rest/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/hornetq-rest/pom.xml 2011-05-12 11:27:50 UTC (rev 10640)
+++ branches/Branch_2_2_2_REST/hornetq-rest/pom.xml 2011-05-12 12:05:27 UTC (rev 10641)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest-all</artifactId>
- <version>2.2.2.1</version>
+ <version>2.2.2.2</version>
</parent>
<groupId>org.hornetq.rest</groupId>
Modified: branches/Branch_2_2_2_REST/pom.xml
===================================================================
--- branches/Branch_2_2_2_REST/pom.xml 2011-05-12 11:27:50 UTC (rev 10640)
+++ branches/Branch_2_2_2_REST/pom.xml 2011-05-12 12:05:27 UTC (rev 10641)
@@ -5,7 +5,7 @@
<name>HornetQ REST Interface Parent POM</name>
<groupId>org.hornetq.rest</groupId>
<artifactId>hornetq-rest-all</artifactId>
- <version>2.2.2.1</version>
+ <version>2.2.2.2</version>
<packaging>pom</packaging>
<properties>
14 years, 12 months
JBoss hornetq SVN: r10640 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-12 07:27:50 -0400 (Thu, 12 May 2011)
New Revision: 10640
Modified:
trunk/.gitignore
Log:
git: Ignore ./bin
Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore 2011-05-12 11:27:32 UTC (rev 10639)
+++ trunk/.gitignore 2011-05-12 11:27:50 UTC (rev 10640)
@@ -6,6 +6,7 @@
!etc/org.eclipse.jdt.core.prefs
org.maven.ide.eclipse.prefs
.classpath
+/bin
# /
/build
14 years, 12 months
JBoss hornetq SVN: r10639 - trunk.
by do-not-reply＠jboss.org
Author: borges
Date: 2011-05-12 07:27:32 -0400 (Thu, 12 May 2011)
New Revision: 10639
Modified:
trunk/pom.xml
Log:
mvn: Do run all tests
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-05-12 03:44:06 UTC (rev 10638)
+++ trunk/pom.xml 2011-05-12 11:27:32 UTC (rev 10639)
@@ -467,6 +467,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.4</version>
<configuration>
+ <testFailureIgnore>true</testFailureIgnore>
<runOrder>alphabetical</runOrder>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
</configuration>
14 years, 12 months
JBoss hornetq SVN: r10638 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-11 23:44:06 -0400 (Wed, 11 May 2011)
New Revision: 10638
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
Log:
improvement on PrintPages
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-05-12 03:43:25 UTC (rev 10637)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2011-05-12 03:44:06 UTC (rev 10638)
@@ -2402,7 +2402,7 @@
}
}
- private static class PageUpdateTXEncoding implements EncodingSupport
+ public static class PageUpdateTXEncoding implements EncodingSupport
{
public long pageTX;
14 years, 12 months
JBoss hornetq SVN: r10637 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-11 23:43:25 -0400 (Wed, 11 May 2011)
New Revision: 10637
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PrintPages.java
Log:
improvement on PrintPages
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PrintPages.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PrintPages.java 2011-05-12 03:24:26 UTC (rev 10636)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/PrintPages.java 2011-05-12 03:43:25 UTC (rev 10637)
@@ -26,6 +26,7 @@
import org.hornetq.api.core.HornetQBuffer;
import org.hornetq.api.core.HornetQBuffers;
+import org.hornetq.api.core.Pair;
import org.hornetq.api.core.SimpleString;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.journal.PreparedTransactionInfo;
@@ -40,6 +41,7 @@
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.persistence.impl.journal.JournalStorageManager;
import org.hornetq.core.persistence.impl.journal.JournalStorageManager.CursorAckRecordEncoding;
+import org.hornetq.core.persistence.impl.journal.JournalStorageManager.PageUpdateTXEncoding;
import org.hornetq.core.persistence.impl.nullpm.NullStorageManager;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
@@ -71,11 +73,12 @@
if (arg.length != 2)
{
System.err.println("Usage: PrintPages <page foler> <journal folder>");
+ System.exit(-1);
}
try
{
- Map<Long, Set<PagePosition>> cursorACKs = PrintPages.loadCursorACKs(arg[1]);
+ Pair<Map<Long, Set<PagePosition>>, Set<Long>> cursorACKs = PrintPages.loadCursorACKs(arg[1]);
ScheduledExecutorService scheduled = Executors.newScheduledThreadPool(1);
final ExecutorService executor = Executors.newFixedThreadPool(10);
@@ -116,7 +119,7 @@
for (PagedMessage msg : msgs)
{
msg.initMessage(sm);
- System.out.print("pg=" + pg + ", msg=" + msgID + "=" + msg.getMessage());
+ System.out.print("pg=" + pgid + ", msg=" + msgID + ",pgTX=" + msg.getTransactionID() + ", msg=" + msg.getMessage());
System.out.print(",Queues = ");
long q[] = msg.getQueueIDs();
for (int i = 0; i < q.length; i++)
@@ -127,7 +130,7 @@
boolean acked = false;
- Set<PagePosition> positions = cursorACKs.get(q[i]);
+ Set<PagePosition> positions = cursorACKs.a.get(q[i]);
if (positions != null)
{
acked = positions.contains(posCheck);
@@ -143,6 +146,10 @@
System.out.print(",");
}
}
+ if (msg.getTransactionID() != 0 && ! cursorACKs.b.contains(msg.getTransactionID()));
+ {
+ System.out.print(", **PG_TX_NOT_FOUND**");
+ }
System.out.println();
msgID++;
}
@@ -164,7 +171,7 @@
* @return
* @throws Exception
*/
- protected static Map<Long, Set<PagePosition>> loadCursorACKs(final String journalLocation) throws Exception
+ protected static Pair<Map<Long, Set<PagePosition>>, Set<Long>> loadCursorACKs(final String journalLocation) throws Exception
{
SequentialFileFactory messagesFF = new NIOSequentialFileFactory(journalLocation);
@@ -188,14 +195,17 @@
messagesJournal.load(records, txs, null);
Map<Long, Set<PagePosition>> cursorRecords = new HashMap<Long, Set<PagePosition>>();
+
+ Set<Long> pgTXs = new HashSet<Long>();
for (RecordInfo record : records)
{
+ byte[] data = record.data;
+
+ HornetQBuffer buff = HornetQBuffers.wrappedBuffer(data);
+
if (record.userRecordType == JournalStorageManager.ACKNOWLEDGE_CURSOR)
{
- byte[] data = record.data;
-
- HornetQBuffer buff = HornetQBuffers.wrappedBuffer(data);
CursorAckRecordEncoding encoding = new CursorAckRecordEncoding();
encoding.decode(buff);
@@ -209,8 +219,23 @@
set.add(encoding.position);
}
+ else if (record.userRecordType == JournalStorageManager.PAGE_TRANSACTION)
+ {
+ if (record.isUpdate)
+ {
+ PageUpdateTXEncoding pageUpdate = new PageUpdateTXEncoding();
+
+ pageUpdate.decode(buff);
+ pgTXs.add(pageUpdate.pageTX);
+ }
+ else
+ {
+ pgTXs.add(record.id);
+ }
+ }
}
- return cursorRecords;
+
+ return new Pair<Map<Long, Set<PagePosition>>, Set<Long>>(cursorRecords, pgTXs);
}
// Package protected ---------------------------------------------
14 years, 12 months
JBoss hornetq SVN: r10636 - branches/Branch_2_2_EAP/tools.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-11 23:24:26 -0400 (Wed, 11 May 2011)
New Revision: 10636
Modified:
branches/Branch_2_2_EAP/tools/printData.sh
Log:
fixing sh
Modified: branches/Branch_2_2_EAP/tools/printData.sh
===================================================================
--- branches/Branch_2_2_EAP/tools/printData.sh 2011-05-12 03:11:07 UTC (rev 10635)
+++ branches/Branch_2_2_EAP/tools/printData.sh 2011-05-12 03:24:26 UTC (rev 10636)
@@ -1,2 +1,2 @@
#tool used to debug Journal Data
-java -cp ../build/jars/hornetq-core.jar:.../thirdparty/org/jboss/netty/lib/netty.jar org.hornetq.core.persistence.impl.journal.PrintData $*
+java -cp ../build/jars/hornetq-core.jar:../thirdparty/org/jboss/netty/lib/netty.jar org.hornetq.core.persistence.impl.journal.PrintData $*
14 years, 12 months
JBoss hornetq SVN: r10635 - branches/Branch_2_2_EAP/tools.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-11 23:11:07 -0400 (Wed, 11 May 2011)
New Revision: 10635
Modified:
branches/Branch_2_2_EAP/tools/printData.sh
branches/Branch_2_2_EAP/tools/printPages.sh
Log:
changing printPages and printData
Modified: branches/Branch_2_2_EAP/tools/printData.sh
===================================================================
--- branches/Branch_2_2_EAP/tools/printData.sh 2011-05-12 03:10:21 UTC (rev 10634)
+++ branches/Branch_2_2_EAP/tools/printData.sh 2011-05-12 03:11:07 UTC (rev 10635)
@@ -1,2 +1,2 @@
#tool used to debug Journal Data
-java -cp ./build/jars/hornetq-core.jar:./thirdparty/org/jboss/netty/lib/netty.jar org.hornetq.core.persistence.impl.journal.PrintData $*
+java -cp ../build/jars/hornetq-core.jar:.../thirdparty/org/jboss/netty/lib/netty.jar org.hornetq.core.persistence.impl.journal.PrintData $*
Modified: branches/Branch_2_2_EAP/tools/printPages.sh
===================================================================
--- branches/Branch_2_2_EAP/tools/printPages.sh 2011-05-12 03:10:21 UTC (rev 10634)
+++ branches/Branch_2_2_EAP/tools/printPages.sh 2011-05-12 03:11:07 UTC (rev 10635)
@@ -1,2 +1,2 @@
#tool used to debug paging Data
-java -cp ./build/jars/hornetq-core.jar:./thirdparty/org/jboss/netty/lib/netty.jar org.hornetq.core.paging.PrintPages $*
+java -cp ../build/jars/hornetq-core.jar:../thirdparty/org/jboss/netty/lib/netty.jar org.hornetq.core.paging.PrintPages $*
14 years, 12 months
JBoss hornetq SVN: r10634 - branches/Branch_2_2_EAP/tools.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-05-11 23:10:21 -0400 (Wed, 11 May 2011)
New Revision: 10634
Added:
branches/Branch_2_2_EAP/tools/printData.sh
branches/Branch_2_2_EAP/tools/printPages.sh
Log:
Adding printPages and printData for dev & debug purposes
Added: branches/Branch_2_2_EAP/tools/printData.sh
===================================================================
--- branches/Branch_2_2_EAP/tools/printData.sh (rev 0)
+++ branches/Branch_2_2_EAP/tools/printData.sh 2011-05-12 03:10:21 UTC (rev 10634)
@@ -0,0 +1,2 @@
+#tool used to debug Journal Data
+java -cp ./build/jars/hornetq-core.jar:./thirdparty/org/jboss/netty/lib/netty.jar org.hornetq.core.persistence.impl.journal.PrintData $*
Property changes on: branches/Branch_2_2_EAP/tools/printData.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/Branch_2_2_EAP/tools/printPages.sh
===================================================================
--- branches/Branch_2_2_EAP/tools/printPages.sh (rev 0)
+++ branches/Branch_2_2_EAP/tools/printPages.sh 2011-05-12 03:10:21 UTC (rev 10634)
@@ -0,0 +1,2 @@
+#tool used to debug paging Data
+java -cp ./build/jars/hornetq-core.jar:./thirdparty/org/jboss/netty/lib/netty.jar org.hornetq.core.paging.PrintPages $*
Property changes on: branches/Branch_2_2_EAP/tools/printPages.sh
___________________________________________________________________
Added: svn:executable
+ *
14 years, 12 months