JBoss hornetq SVN: r10501 - in branches/Branch_2_2_EAP: src/main/org/hornetq/core/client/impl and 5 other directories.
by do-not-reply@jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-13 14:00:12 -0400 (Wed, 13 Apr 2011)
New Revision: 10501
Added:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/ClientSession.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/DelegatingSession.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java
branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java
branches/Branch_2_2_EAP/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java
branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
Log:
https://issues.jboss.org/browse/JBPAPP-6300 - Fixing possible dead lock over Failover with metadata
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/ClientSession.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/ClientSession.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/api/core/client/ClientSession.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -567,4 +567,12 @@
* @throws HornetQException
*/
void addMetaData(String key, String data) throws HornetQException;
+
+ /**
+ * Attach any metadata to the session.
+ * Sends a Metadata using the older version
+ * @deprecated Use {@link ClientSession#addMetaData(String, String)}
+ * @throws HornetQException
+ */
+ void addMetaDataV1(String key, String data) throws HornetQException;
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -452,6 +452,11 @@
{
stopPingingAfterOne = true;
}
+
+ public void resumePinging()
+ {
+ stopPingingAfterOne = false;
+ }
// Protected
// ------------------------------------------------------------------------------------
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -47,6 +47,7 @@
import org.hornetq.core.protocol.core.impl.wireformat.RollbackMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage;
+import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2;
import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionCloseMessage;
@@ -1085,16 +1086,22 @@
// Resetting the metadata after failover
for (Map.Entry<String, String> entries : metadata.entrySet())
{
- sendPacketWithoutLock(new SessionAddMetaDataMessage(entries.getKey(), entries.getValue()));
+ sendPacketWithoutLock(new SessionAddMetaDataMessageV2(entries.getKey(), entries.getValue(), false));
}
}
- public void addMetaData(String key, String data) throws HornetQException
+ public void addMetaDataV1(String key, String data) throws HornetQException
{
metadata.put(key, data);
channel.sendBlocking(new SessionAddMetaDataMessage(key, data));
}
+ public void addMetaData(String key, String data) throws HornetQException
+ {
+ metadata.put(key, data);
+ channel.send(new SessionAddMetaDataMessageV2(key, data));
+ }
+
public ClientSessionFactoryInternal getSessionFactory()
{
return sessionFactory;
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/DelegatingSession.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -566,7 +566,14 @@
{
session.addMetaData(key, data);
}
+
+ @Deprecated
+ public void addMetaDataV1(String key, String data) throws HornetQException
+ {
+ session.addMetaDataV1(key, data);
+ }
+
public boolean isCompressLargeMessages()
{
return session.isCompressLargeMessages();
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -63,6 +63,7 @@
import org.hornetq.core.protocol.core.impl.wireformat.RollbackMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage;
+import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2;
import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionConsumerCloseMessage;
@@ -479,6 +480,12 @@
session.addMetaData(message.getKey(), message.getData());
break;
}
+ case PacketImpl.SESS_ADD_METADATA2:
+ {
+ SessionAddMetaDataMessageV2 message = (SessionAddMetaDataMessageV2)packet;
+ session.addMetaData(message.getKey(), message.getData());
+ break;
+ }
}
}
catch (HornetQXAException e)
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/PacketDecoder.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -41,6 +41,8 @@
import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_PREPARE;
import static org.hornetq.core.protocol.core.impl.PacketImpl.REPLICATION_RESPONSE;
import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ACKNOWLEDGE;
+import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA;
+import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA2;
import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY;
import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_BINDINGQUERY_RESP;
import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_CLOSE;
@@ -81,12 +83,9 @@
import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_START;
import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_XA_SUSPEND;
import static org.hornetq.core.protocol.core.impl.PacketImpl.SUBSCRIBE_TOPOLOGY;
-import static org.hornetq.core.protocol.core.impl.PacketImpl.SESS_ADD_METADATA;
import org.hornetq.api.core.HornetQBuffer;
-import org.hornetq.core.client.impl.ClientMessageImpl;
import org.hornetq.core.logging.Logger;
-import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.protocol.core.Packet;
import org.hornetq.core.protocol.core.impl.wireformat.ClusterTopologyChangeMessage;
import org.hornetq.core.protocol.core.impl.wireformat.CreateQueueMessage;
@@ -117,6 +116,7 @@
import org.hornetq.core.protocol.core.impl.wireformat.RollbackMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionAcknowledgeMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessage;
+import org.hornetq.core.protocol.core.impl.wireformat.SessionAddMetaDataMessageV2;
import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionBindingQueryResponseMessage;
import org.hornetq.core.protocol.core.impl.wireformat.SessionCloseMessage;
@@ -519,6 +519,11 @@
packet = new SessionAddMetaDataMessage();
break;
}
+ case SESS_ADD_METADATA2:
+ {
+ packet = new SessionAddMetaDataMessageV2();
+ break;
+ }
default:
{
throw new IllegalArgumentException("Invalid type: " + packetType);
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/PacketImpl.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -186,6 +186,8 @@
public static final byte SESS_ADD_METADATA = 104;
+ public static final byte SESS_ADD_METADATA2 = 105;
+
public static final byte CLUSTER_TOPOLOGY = 110;
public static final byte NODE_ANNOUNCE = 111;
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessage.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -18,6 +18,8 @@
/**
* A SessionAddMetaDataMessage
+ *
+ * Packet deprecated: It exists only to support old formats
*
* @author <a href="mailto:hgao@redhat.com>Howard Gao</a>
*
Added: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java (rev 0)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2010 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package org.hornetq.core.protocol.core.impl.wireformat;
+
+import org.hornetq.api.core.HornetQBuffer;
+import org.hornetq.core.protocol.core.impl.PacketImpl;
+
+/**
+ * A SessionAddMetaDataMessage
+ *
+ * This packet replaces {@link SessionAddMetaDataMessage}
+ *
+ * @author Clebert Suconic</a>
+ *
+ *
+ */
+public class SessionAddMetaDataMessageV2 extends PacketImpl
+{
+ private String key;
+ private String data;
+ /**
+ * It won require confirmation during failover / reconnect
+ */
+ private boolean requiresConfirmation = true;
+
+ public SessionAddMetaDataMessageV2()
+ {
+ super(PacketImpl.SESS_ADD_METADATA2);
+ }
+
+ public SessionAddMetaDataMessageV2(String k, String d)
+ {
+ this();
+ key = k;
+ data = d;
+ }
+
+ public SessionAddMetaDataMessageV2(String k, String d, boolean requiresConfirmation)
+ {
+ this();
+ key = k;
+ data = d;
+ this.requiresConfirmation = requiresConfirmation;
+ }
+
+ @Override
+ public void encodeRest(final HornetQBuffer buffer)
+ {
+ buffer.writeString(key);
+ buffer.writeString(data);
+ buffer.writeBoolean(requiresConfirmation);
+ }
+
+ @Override
+ public void decodeRest(final HornetQBuffer buffer)
+ {
+ key = buffer.readString();
+ data = buffer.readString();
+ requiresConfirmation = buffer.readBoolean();
+ }
+
+ @Override
+ public final boolean isRequiresConfirmations()
+ {
+ return requiresConfirmation;
+ }
+
+
+
+ public String getKey()
+ {
+ return key;
+ }
+
+ public String getData()
+ {
+ return data;
+ }
+
+}
Modified: branches/Branch_2_2_EAP/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -1408,6 +1408,15 @@
// TODO Auto-generated method stub
}
+
+ /* (non-Javadoc)
+ * @see org.hornetq.api.core.client.ClientSession#addMetaDataV1(java.lang.String, java.lang.String)
+ */
+ public void addMetaDataV1(String key, String data) throws HornetQException
+ {
+ // TODO Auto-generated method stub
+
+ }
}
}
Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2011-04-13 15:30:27 UTC (rev 10500)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2011-04-13 18:00:12 UTC (rev 10501)
@@ -38,6 +38,7 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.jms.client.HornetQBytesMessage;
import org.hornetq.jms.client.HornetQTextMessage;
+import org.hornetq.tests.util.RandomUtil;
/**
* A MultiThreadRandomReattachTestBase
@@ -264,12 +265,19 @@
protected ClientSession createAutoCommitSession(final ClientSessionFactory sf) throws Exception
{
- return sf.createSession(false, true, true);
+ ClientSession session = sf.createSession(false, true, true);
+ session.addMetaData("someData", RandomUtil.randomString());
+ session.addMetaData("someData2", RandomUtil.randomString());
+ return session;
}
protected ClientSession createTransactionalSession(final ClientSessionFactory sf) throws Exception
{
- return sf.createSession(false, false, false);
+ ClientSession session = sf.createSession(false, false, false);
+ session.addMetaData("someData", RandomUtil.randomString());
+ session.addMetaData("someData2", RandomUtil.randomString());
+
+ return session;
}
protected void doTestA(final ClientSessionFactory sf, final int threadNum, final ClientSession session2) throws Exception
@@ -432,6 +440,7 @@
}
ClientSession sessSend = sf.createSession(false, true, true);
+ sessSend.addMetaData("some-data", RandomUtil.randomString());
ClientProducer producer = sessSend.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
@@ -497,7 +506,9 @@
long start = System.currentTimeMillis();
ClientSession s = sf.createSession(false, false, false);
+ s.addMetaData("some-data", RandomUtil.randomString());
+
final int numMessages = 100;
final int numSessions = 10;
@@ -523,7 +534,9 @@
}
ClientSession sessSend = sf.createSession(false, false, false);
+ sessSend.addMetaData("some-data", RandomUtil.randomString());
+
ClientProducer producer = sessSend.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
sendMessages(sessSend, producer, numMessages, threadNum);
@@ -606,7 +619,9 @@
long start = System.currentTimeMillis();
ClientSession s = sf.createSession(false, false, false);
+ s.addMetaData("some-data", RandomUtil.randomString());
+
final int numMessages = 100;
final int numSessions = 10;
@@ -619,6 +634,7 @@
SimpleString subName = new SimpleString(threadNum + " sub" + i);
ClientSession sessConsume = sf.createSession(false, false, false);
+ sessConsume.addMetaData("data", RandomUtil.randomString());
sessConsume.createQueue(MultiThreadRandomReattachTestBase.ADDRESS, subName, null, false);
@@ -630,7 +646,9 @@
}
ClientSession sessSend = sf.createSession(false, false, false);
+ sessSend.addMetaData("some-data", RandomUtil.randomString());
+
ClientProducer producer = sessSend.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
sendMessages(sessSend, producer, numMessages, threadNum);
@@ -746,7 +764,9 @@
long start = System.currentTimeMillis();
ClientSession s = sf.createSession(false, false, false);
+ s.addMetaData("some-data", RandomUtil.randomString());
+
final int numMessages = 100;
final int numSessions = 10;
@@ -759,7 +779,9 @@
SimpleString subName = new SimpleString(threadNum + "sub" + i);
ClientSession sessConsume = sf.createSession(false, true, true);
+ sessConsume.addMetaData("some-data", RandomUtil.randomString());
+
sessConsume.start();
sessConsume.createQueue(MultiThreadRandomReattachTestBase.ADDRESS, subName, null, false);
@@ -772,6 +794,7 @@
}
ClientSession sessSend = sf.createSession(false, true, true);
+ sessSend.addMetaData("some-data", RandomUtil.randomString());
ClientProducer producer = sessSend.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
@@ -804,6 +827,8 @@
long start = System.currentTimeMillis();
ClientSession s = sf.createSession(false, false, false);
+ s.addMetaData("data", RandomUtil.randomString());
+
final int numMessages = 100;
@@ -817,6 +842,7 @@
SimpleString subName = new SimpleString(threadNum + "sub" + i);
ClientSession sessConsume = sf.createSession(false, true, true);
+ sessConsume.addMetaData("data", RandomUtil.randomString());
sessConsume.createQueue(MultiThreadRandomReattachTestBase.ADDRESS, subName, null, false);
@@ -828,6 +854,7 @@
}
ClientSession sessSend = sf.createSession(false, true, true);
+ sessSend.addMetaData("data", RandomUtil.randomString());
ClientProducer producer = sessSend.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
@@ -865,6 +892,7 @@
long start = System.currentTimeMillis();
ClientSession s = sf.createSession(false, false, false);
+ s.addMetaData("data", RandomUtil.randomString());
final int numMessages = 100;
@@ -878,6 +906,8 @@
SimpleString subName = new SimpleString(threadNum + "sub" + i);
ClientSession sessConsume = sf.createSession(false, false, false);
+ sessConsume.addMetaData("data", RandomUtil.randomString());
+
sessConsume.start();
@@ -891,7 +921,9 @@
}
ClientSession sessSend = sf.createSession(false, false, false);
+ sessSend.addMetaData("data", RandomUtil.randomString());
+
ClientProducer producer = sessSend.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
sendMessages(sessSend, producer, numMessages, threadNum);
@@ -941,7 +973,9 @@
long start = System.currentTimeMillis();
ClientSession s = sf.createSession(false, false, false);
+ s.addMetaData("data", RandomUtil.randomString());
+
final int numMessages = 100;
final int numSessions = 10;
@@ -954,7 +988,9 @@
SimpleString subName = new SimpleString(threadNum + "sub" + i);
ClientSession sessConsume = sf.createSession(false, false, false);
+ sessConsume.addMetaData("data", RandomUtil.randomString());
+
sessConsume.createQueue(MultiThreadRandomReattachTestBase.ADDRESS, subName, null, false);
ClientConsumer consumer = sessConsume.createConsumer(subName);
@@ -965,6 +1001,7 @@
}
ClientSession sessSend = sf.createSession(false, false, false);
+ sessSend.addMetaData("data", RandomUtil.randomString());
ClientProducer producer = sessSend.createProducer(MultiThreadRandomReattachTestBase.ADDRESS);
@@ -1018,14 +1055,18 @@
protected void doTestI(final ClientSessionFactory sf, final int threadNum) throws Exception
{
ClientSession sessCreate = sf.createSession(false, true, true);
+ sessCreate.addMetaData("data", RandomUtil.randomString());
+
sessCreate.createQueue(MultiThreadRandomReattachTestBase.ADDRESS,
new SimpleString(threadNum + MultiThreadRandomReattachTestBase.ADDRESS.toString()),
null,
false);
ClientSession sess = sf.createSession(false, true, true);
+ sess.addMetaData("data", RandomUtil.randomString());
+
sess.start();
ClientConsumer consumer = sess.createConsumer(new SimpleString(threadNum + MultiThreadRandomReattachTestBase.ADDRESS.toString()));
@@ -1051,13 +1092,16 @@
protected void doTestJ(final ClientSessionFactory sf, final int threadNum) throws Exception
{
ClientSession sessCreate = sf.createSession(false, true, true);
+ sessCreate.addMetaData("data", RandomUtil.randomString());
+
sessCreate.createQueue(MultiThreadRandomReattachTestBase.ADDRESS,
new SimpleString(threadNum + MultiThreadRandomReattachTestBase.ADDRESS.toString()),
null,
false);
ClientSession sess = sf.createSession(false, true, true);
+ sess.addMetaData("data", RandomUtil.randomString());
sess.start();
@@ -1084,6 +1128,7 @@
protected void doTestK(final ClientSessionFactory sf, final int threadNum) throws Exception
{
ClientSession s = sf.createSession(false, false, false);
+ s.addMetaData("data", RandomUtil.randomString());
s.createQueue(MultiThreadRandomReattachTestBase.ADDRESS,
new SimpleString(threadNum + MultiThreadRandomReattachTestBase.ADDRESS.toString()),
@@ -1114,6 +1159,8 @@
for (int i = 0; i < numSessions; i++)
{
ClientSession session = sf.createSession(false, false, false);
+
+ session.addMetaData("data", RandomUtil.randomString());
session.close();
}
@@ -1129,6 +1176,7 @@
false);
ClientSession sess = sf.createSession(false, true, true);
+ sess.addMetaData("data", RandomUtil.randomString());
sess.stop();
13 years, 2 months
JBoss hornetq SVN: r10500 - branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl.
by do-not-reply@jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2011-04-13 11:30:27 -0400 (Wed, 13 Apr 2011)
New Revision: 10500
Modified:
branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
Log:
I just realized by looking at the code, and I'm doing sync (blocked) calls on failover, what is not supposed to happen. removing the invalid call.
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-04-13 11:02:48 UTC (rev 10499)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-04-13 15:30:27 UTC (rev 10500)
@@ -1083,21 +1083,12 @@
}
// Resetting the metadata after failover
- try
+ for (Map.Entry<String, String> entries : metadata.entrySet())
{
- for (Map.Entry<String, String> entries : metadata.entrySet())
- {
- addMetaData(entries.getKey(), entries.getValue());
- }
+ sendPacketWithoutLock(new SessionAddMetaDataMessage(entries.getKey(), entries.getValue()));
}
- catch (HornetQException e)
- {
+ }
- log.warn("Error on resending metadata: " + metadata, e);
-
- }
- }
-
public void addMetaData(String key, String data) throws HornetQException
{
metadata.put(key, data);
13 years, 2 months
JBoss hornetq SVN: r10499 - in branches/Branch_2_2_EAP/src: main/org/hornetq/ra and 1 other directories.
by do-not-reply@jboss.org
Author: ataylor
Date: 2011-04-13 07:02:48 -0400 (Wed, 13 Apr 2011)
New Revision: 10499
Modified:
branches/Branch_2_2_EAP/src/config/ra.xml
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAProperties.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/Util.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivation.java
branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java
Log:
https://issues.jboss.org/browse/HORNETQ-670 - added jndi params attr to ra
Modified: branches/Branch_2_2_EAP/src/config/ra.xml
===================================================================
--- branches/Branch_2_2_EAP/src/config/ra.xml 2011-04-12 20:10:09 UTC (rev 10498)
+++ branches/Branch_2_2_EAP/src/config/ra.xml 2011-04-13 11:02:48 UTC (rev 10499)
@@ -83,6 +83,12 @@
<config-property-value></config-property-value>
</config-property>
<config-property>
+ <description>The jndi params to use to look up the jms resources if local jndi is not to be used</description>
+ <config-property-name>JndiParams</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory,java.naming.provider.url=jnp://localhost:1199,java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces</config-property-value>
+ </config-property>
+ <config-property>
<description>The discovery group address</description>
<config-property-name>DiscoveryAddress</config-property-name>
<config-property-type>java.lang.String</config-property-type>
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAProperties.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAProperties.java 2011-04-12 20:10:09 UTC (rev 10498)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQRAProperties.java 2011-04-13 11:02:48 UTC (rev 10499)
@@ -13,6 +13,7 @@
package org.hornetq.ra;
import java.io.Serializable;
+import java.util.Hashtable;
import org.hornetq.core.logging.Logger;
@@ -60,6 +61,10 @@
private long setupInterval = DEFAULT_SETUP_INTERVAL;
+ private Hashtable jndiParams;
+
+ private boolean useJNDI;
+
/**
* Constructor
*/
@@ -127,7 +132,37 @@
this.password = password;
}
+ /**
+ * @return the useJNDI
+ */
+ public boolean isUseJNDI()
+ {
+ return useJNDI;
+ }
+
/**
+ * @param value the useJNDI to set
+ */
+ public void setUseJNDI(final boolean value)
+ {
+ useJNDI = value;
+ }
+
+ /**
+ *
+ * @return return the jndi params to use
+ */
+ public Hashtable getParsedJndiParams()
+ {
+ return jndiParams;
+ }
+
+
+ public void setParsedJndiParams(Hashtable params)
+ {
+ jndiParams = params;
+ }
+ /**
* Get the use XA flag
* @return The value
*/
@@ -202,4 +237,5 @@
return "HornetQRAProperties[localTx=" + localTx +
", userName=" + userName + ", password=" + password + "]";
}
+
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-04-12 20:10:09 UTC (rev 10498)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-04-13 11:02:48 UTC (rev 10499)
@@ -14,6 +14,7 @@
import java.io.Serializable;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -103,6 +104,8 @@
private TransactionManager tm;
+ private String unparsedJndiParams;
+
/**
* Constructor
*/
@@ -1090,7 +1093,42 @@
raProperties.setPassword(password);
}
+ /**
+ * @return the useJNDI
+ */
+ public boolean isUseJNDI()
+ {
+ return raProperties.isUseJNDI();
+ }
+
/**
+ * @param value the useJNDI to set
+ */
+ public void setUseJNDI(final boolean value)
+ {
+ raProperties.setUseJNDI(value);
+ }
+
+ /**
+ *
+ * @return return the jndi params to use
+ */
+ public String getJndiParams()
+ {
+ return unparsedJndiParams;
+ }
+
+ public void setJndiParams(String jndiParams)
+ {
+ unparsedJndiParams = jndiParams;
+ raProperties.setParsedJndiParams(Util.parseHashtableConfig(jndiParams));
+ }
+
+ public Hashtable getParsedJndiParams()
+ {
+ return raProperties.getParsedJndiParams();
+ }
+ /**
* Get the client ID
*
* @return The value
@@ -1648,5 +1686,4 @@
cf.setConnectionLoadBalancingPolicyClassName(val5);
}
}
-
}
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/Util.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/Util.java 2011-04-12 20:10:09 UTC (rev 10498)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/Util.java 2011-04-13 11:02:48 UTC (rev 10499)
@@ -13,10 +13,7 @@
package org.hornetq.ra;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.naming.Context;
import javax.transaction.TransactionManager;
@@ -176,6 +173,27 @@
return context.lookup(name);
}
+ public static Hashtable parseHashtableConfig(final String config)
+ {
+ Hashtable hashtable = new Hashtable();
+
+ String[] topElements = config.split(",");
+
+ for (String element : topElements)
+ {
+ String expression[] = element.split("=");
+
+ if (expression.length != 2)
+ {
+ throw new IllegalArgumentException("Invalid expression " + element + " at " + config);
+ }
+
+ hashtable.put(expression[0].trim(), expression[1].trim());
+ }
+
+ return hashtable;
+ }
+
public static List<Map<String, Object>> parseConfig(final String config)
{
List<Map<String, Object>> result =new ArrayList<Map<String, Object>>();
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivation.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2011-04-12 20:10:09 UTC (rev 10498)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2011-04-13 11:02:48 UTC (rev 10499)
@@ -397,7 +397,15 @@
if (spec.isUseJNDI())
{
- Context ctx = new InitialContext();
+ Context ctx;
+ if(spec.getParsedJndiParams() == null)
+ {
+ ctx = new InitialContext();
+ }
+ else
+ {
+ ctx = new InitialContext(spec.getParsedJndiParams());
+ }
HornetQActivation.log.debug("Using context " + ctx.getEnvironment() + " for " + spec);
if (HornetQActivation.trace)
{
Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java 2011-04-12 20:10:09 UTC (rev 10498)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java 2011-04-13 11:02:48 UTC (rev 10499)
@@ -13,6 +13,7 @@
package org.hornetq.ra.inflow;
import java.util.HashMap;
+import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@ -84,8 +85,12 @@
/** Transaction timeout */
private Integer transactionTimeout;
- private boolean useJNDI = true;
+ private Boolean useJNDI = true;
+ private String jndiParams = null;
+
+ private Hashtable parsedJndiParams;
+
/* use local tx instead of XA*/
private Boolean localTx;
@@ -137,6 +142,10 @@
*/
public boolean isUseJNDI()
{
+ if(useJNDI == null)
+ {
+ return ra.isUseJNDI();
+ }
return useJNDI;
}
@@ -149,6 +158,34 @@
}
/**
+ *
+ * @return return the jndi params to use
+ */
+ public String getJndiParams()
+ {
+ if(jndiParams == null)
+ {
+ return ra.getJndiParams();
+ }
+ return jndiParams;
+ }
+
+ public void setJndiParams(String jndiParams)
+ {
+ this.jndiParams = jndiParams;
+ parsedJndiParams = Util.parseHashtableConfig(jndiParams);
+ }
+
+ public Hashtable getParsedJndiParams()
+ {
+ if(parsedJndiParams == null)
+ {
+ return ra.getParsedJndiParams();
+ }
+ return parsedJndiParams;
+ }
+
+ /**
* Set the resource adapter
* @param ra The resource adapter
* @exception ResourceException Thrown if incorrect resource adapter
13 years, 2 months
JBoss hornetq SVN: r10498 - in trunk: examples and 23 other directories.
by do-not-reply@jboss.org
Author: ataylor
Date: 2011-04-12 16:10:09 -0400 (Tue, 12 Apr 2011)
New Revision: 10498
Added:
trunk/distribution/hornetq-distribution.iml
trunk/examples/hornetq-examples.iml
trunk/hornetq-bootstrap/hornetq-bootstrap.iml
trunk/hornetq-core-client/hornetq-core-client.iml
trunk/hornetq-core/hornetq-core.iml
trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml
trunk/hornetq-jms-client/hornetq-jms-client.iml
trunk/hornetq-jms/hornetq-jms.iml
trunk/hornetq-logging/hornetq-logging.iml
trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml
trunk/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml
trunk/hornetq-ra/hornetq-rar-pom.iml
trunk/hornetq-service-sar/hornetq-service-sar.iml
trunk/hornetq-spring-integration/hornetq-spring-integration.iml
trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml
trunk/tests/concurrent-tests/concurrent-tests.iml
trunk/tests/hornetq-tests-pom.iml
trunk/tests/integration-tests/integration-tests.iml
trunk/tests/jms-tests/jms-tests.iml
trunk/tests/joram-tests/joram-tests.iml
trunk/tests/performance-tests/performance-tests.iml
trunk/tests/soak-tests/soak-tests.iml
trunk/tests/stress-tests/stress-tests.iml
trunk/tests/timing-tests/timing-tests.iml
trunk/tests/unit-tests/unit-tests.iml
Modified:
trunk/tests/jms-tests/pom.xml
Log:
intellij project files
Added: trunk/distribution/hornetq-distribution.iml
===================================================================
--- trunk/distribution/hornetq-distribution.iml (rev 0)
+++ trunk/distribution/hornetq-distribution.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
Added: trunk/examples/hornetq-examples.iml
===================================================================
--- trunk/examples/hornetq-examples.iml (rev 0)
+++ trunk/examples/hornetq-examples.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
Added: trunk/hornetq-bootstrap/hornetq-bootstrap.iml
===================================================================
--- trunk/hornetq-bootstrap/hornetq-bootstrap.iml (rev 0)
+++ trunk/hornetq-bootstrap/hornetq-bootstrap.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.0.5.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-core/hornetq-core.iml
===================================================================
--- trunk/hornetq-core/hornetq-core.iml (rev 0)
+++ trunk/hornetq-core/hornetq-core.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/javacc" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-core-client/hornetq-core-client.iml
===================================================================
--- trunk/hornetq-core-client/hornetq-core-client.iml (rev 0)
+++ trunk/hornetq-core-client/hornetq-core-client.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml
===================================================================
--- trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml (rev 0)
+++ trunk/hornetq-jboss-as-integration/hornetq-jboss-as-integration.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-jms/hornetq-jms.iml
===================================================================
--- trunk/hornetq-jms/hornetq-jms.iml (rev 0)
+++ trunk/hornetq-jms/hornetq-jms.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-jms-client/hornetq-jms-client.iml
===================================================================
--- trunk/hornetq-jms-client/hornetq-jms-client.iml (rev 0)
+++ trunk/hornetq-jms-client/hornetq-jms-client.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-logging/hornetq-logging.iml
===================================================================
--- trunk/hornetq-logging/hornetq-logging.iml (rev 0)
+++ trunk/hornetq-logging/hornetq-logging.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml
===================================================================
--- trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml (rev 0)
+++ trunk/hornetq-ra/hornetq-ra-jar/hornetq-ra.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" scope="PROVIDED" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" scope="PROVIDED" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml
===================================================================
--- trunk/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml (rev 0)
+++ trunk/hornetq-ra/hornetq-ra-rar/hornetq-rar.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-jms-client" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-core-client" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-ra/hornetq-rar-pom.iml
===================================================================
--- trunk/hornetq-ra/hornetq-rar-pom.iml (rev 0)
+++ trunk/hornetq-ra/hornetq-rar-pom.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
Added: trunk/hornetq-service-sar/hornetq-service-sar.iml
===================================================================
--- trunk/hornetq-service-sar/hornetq-service-sar.iml (rev 0)
+++ trunk/hornetq-service-sar/hornetq-service-sar.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-jboss-as-integration" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-spring-integration/hornetq-spring-integration.iml
===================================================================
--- trunk/hornetq-spring-integration/hornetq-spring-integration.iml (rev 0)
+++ trunk/hornetq-spring-integration/hornetq-spring-integration.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
+ </component>
+</module>
+
Added: trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml
===================================================================
--- trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml (rev 0)
+++ trunk/hornetq-twitter-integration/hornetq-twitter-integration.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
+ </component>
+</module>
+
Added: trunk/tests/concurrent-tests/concurrent-tests.iml
===================================================================
--- trunk/tests/concurrent-tests/concurrent-tests.iml (rev 0)
+++ trunk/tests/concurrent-tests/concurrent-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="unit-tests" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="module" module-name="integration-tests" />
+ <orderEntry type="module" module-name="jms-tests" />
+ <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-logging:commons-logging:1.1.0.jboss" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jaspi-api:1.0.0.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-logging" />
+ <orderEntry type="module" module-name="hornetq-twitter-integration" />
+ <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
+ <orderEntry type="module" module-name="hornetq-spring-integration" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
+ </component>
+</module>
+
Added: trunk/tests/hornetq-tests-pom.iml
===================================================================
--- trunk/tests/hornetq-tests-pom.iml (rev 0)
+++ trunk/tests/hornetq-tests-pom.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
+
Added: trunk/tests/integration-tests/integration-tests.iml
===================================================================
--- trunk/tests/integration-tests/integration-tests.iml (rev 0)
+++ trunk/tests/integration-tests/integration-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="jms-tests" />
+ <orderEntry type="module" module-name="unit-tests" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-logging:commons-logging:1.1.0.jboss" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jaspi-api:1.0.0.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-logging" />
+ <orderEntry type="module" module-name="hornetq-twitter-integration" />
+ <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
+ <orderEntry type="module" module-name="hornetq-spring-integration" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
+ </component>
+</module>
+
Added: trunk/tests/jms-tests/jms-tests.iml
===================================================================
--- trunk/tests/jms-tests/jms-tests.iml (rev 0)
+++ trunk/tests/jms-tests/jms-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/config" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="unit-tests" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-logging:commons-logging:1.1.0.jboss" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jaspi-api:1.0.0.GA" level="project" />
+ </component>
+</module>
+
Modified: trunk/tests/jms-tests/pom.xml
===================================================================
--- trunk/tests/jms-tests/pom.xml 2011-04-12 19:47:43 UTC (rev 10497)
+++ trunk/tests/jms-tests/pom.xml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -10,7 +10,7 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>jms-tests</artifactId>
<packaging>jar</packaging>
- <name>HornetQ Unit Tests</name>
+ <name>HornetQ JMS Tests</name>
<dependencies>
<dependency>
Added: trunk/tests/joram-tests/joram-tests.iml
===================================================================
--- trunk/tests/joram-tests/joram-tests.iml (rev 0)
+++ trunk/tests/joram-tests/joram-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <sourceFolder url="file://$MODULE_DIR$/config" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="unit-tests" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="module" module-name="integration-tests" />
+ <orderEntry type="module" module-name="jms-tests" />
+ <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-logging:commons-logging:1.1.0.jboss" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jaspi-api:1.0.0.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-logging" />
+ <orderEntry type="module" module-name="hornetq-twitter-integration" />
+ <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
+ <orderEntry type="module" module-name="hornetq-spring-integration" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
+ </component>
+</module>
+
Added: trunk/tests/performance-tests/performance-tests.iml
===================================================================
--- trunk/tests/performance-tests/performance-tests.iml (rev 0)
+++ trunk/tests/performance-tests/performance-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="unit-tests" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="module" module-name="integration-tests" />
+ <orderEntry type="module" module-name="jms-tests" />
+ <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-logging:commons-logging:1.1.0.jboss" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jaspi-api:1.0.0.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-logging" />
+ <orderEntry type="module" module-name="hornetq-twitter-integration" />
+ <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
+ <orderEntry type="module" module-name="hornetq-spring-integration" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
+ </component>
+</module>
+
Added: trunk/tests/soak-tests/soak-tests.iml
===================================================================
--- trunk/tests/soak-tests/soak-tests.iml (rev 0)
+++ trunk/tests/soak-tests/soak-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="unit-tests" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="module" module-name="integration-tests" />
+ <orderEntry type="module" module-name="jms-tests" />
+ <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-logging:commons-logging:1.1.0.jboss" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jaspi-api:1.0.0.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-logging" />
+ <orderEntry type="module" module-name="hornetq-twitter-integration" />
+ <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
+ <orderEntry type="module" module-name="hornetq-spring-integration" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
+ </component>
+</module>
+
Added: trunk/tests/stress-tests/stress-tests.iml
===================================================================
--- trunk/tests/stress-tests/stress-tests.iml (rev 0)
+++ trunk/tests/stress-tests/stress-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="unit-tests" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="module" module-name="integration-tests" />
+ <orderEntry type="module" module-name="jms-tests" />
+ <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-logging:commons-logging:1.1.0.jboss" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jaspi-api:1.0.0.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-logging" />
+ <orderEntry type="module" module-name="hornetq-twitter-integration" />
+ <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
+ <orderEntry type="module" module-name="hornetq-spring-integration" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
+ </component>
+</module>
+
Added: trunk/tests/timing-tests/timing-tests.iml
===================================================================
--- trunk/tests/timing-tests/timing-tests.iml (rev 0)
+++ trunk/tests/timing-tests/timing-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="unit-tests" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ <orderEntry type="module" module-name="integration-tests" />
+ <orderEntry type="module" module-name="jms-tests" />
+ <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-logging:commons-logging:1.1.0.jboss" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.integration:jboss-transaction-spi:5.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jaspi-api:1.0.0.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-logging" />
+ <orderEntry type="module" module-name="hornetq-twitter-integration" />
+ <orderEntry type="library" name="Maven: org.twitter4j:twitter4j-core:2.1.2" level="project" />
+ <orderEntry type="module" module-name="hornetq-spring-integration" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-asm:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-aop:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-expression:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-jms:3.0.3.RELEASE" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-tx:3.0.3.RELEASE" level="project" />
+ </component>
+</module>
+
Added: trunk/tests/unit-tests/unit-tests.iml
===================================================================
--- trunk/tests/unit-tests/unit-tests.iml (rev 0)
+++ trunk/tests/unit-tests/unit-tests.iml 2011-04-12 20:10:09 UTC (rev 10498)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="hornetq-core" />
+ <orderEntry type="library" name="Maven: org.jboss.netty:netty:3.2.3.Final" level="project" />
+ <orderEntry type="module" module-name="hornetq-jms" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="module" module-name="hornetq-ra" />
+ <orderEntry type="module" module-name="hornetq-bootstrap" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-kernel:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.microcontainer:jboss-dependency:2.0.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jbossxb:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-reflect:2.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xml-apis:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: apache-xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: wutka-dtdparser:dtdparser121:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: sun-jaxb:jaxb-api:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-mdr:2.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jca-api:1.5.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-security-spi:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jbosssx:2.0.3.SP1" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.2" level="project" />
+ </component>
+</module>
+
13 years, 2 months
JBoss hornetq SVN: r10497 - trunk/tests/joram-tests.
by do-not-reply@jboss.org
Author: ataylor
Date: 2011-04-12 15:47:43 -0400 (Tue, 12 Apr 2011)
New Revision: 10497
Modified:
trunk/tests/joram-tests/pom.xml
Log:
fixed pom name
Modified: trunk/tests/joram-tests/pom.xml
===================================================================
--- trunk/tests/joram-tests/pom.xml 2011-04-12 19:41:43 UTC (rev 10496)
+++ trunk/tests/joram-tests/pom.xml 2011-04-12 19:47:43 UTC (rev 10497)
@@ -23,7 +23,7 @@
<groupId>org.hornetq.tests</groupId>
<artifactId>joram-tests</artifactId>
<packaging>jar</packaging>
- <name>HornetQ Unit Tests</name>
+ <name>HornetQ Joram Tests</name>
<dependencies>
<dependency>
13 years, 2 months
JBoss hornetq SVN: r10496 - in trunk: distribution/src/main/assembly and 2 other directories.
by do-not-reply@jboss.org
Author: ataylor
Date: 2011-04-12 15:41:43 -0400 (Tue, 12 Apr 2011)
New Revision: 10496
Added:
trunk/examples/src/main/resources/build.xml
Removed:
trunk/examples/build.xml
Modified:
trunk/build-hornetq.xml
trunk/distribution/src/main/assembly/dep.xml
trunk/examples/pom.xml
Log:
mavenised examples part 3
Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml 2011-04-12 19:33:16 UTC (rev 10495)
+++ trunk/build-hornetq.xml 2011-04-12 19:41:43 UTC (rev 10496)
@@ -443,7 +443,7 @@
<delete quiet="true">
<fileset dir="${logs.dir}" includes="*"/>
</delete>
- <ant antfile="${examples.dir}/build.xml" target="clean" inheritall="false"/>
+ <ant antfile="examples/src/main/resources/build.xml" target="clean" inheritall="false"/>
<ant antfile="build-thirdparty.xml" target="maven-install">
<property name="maven.opts" value="-f hornetq-rest/pom.xml"/>
<property name="maven.goal" value="clean"/>
Modified: trunk/distribution/src/main/assembly/dep.xml
===================================================================
--- trunk/distribution/src/main/assembly/dep.xml 2011-04-12 19:33:16 UTC (rev 10495)
+++ trunk/distribution/src/main/assembly/dep.xml 2011-04-12 19:41:43 UTC (rev 10496)
@@ -171,6 +171,16 @@
<unpack>false</unpack>
</binaries>
</moduleSet>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.hornetq:hornetq-examples</include>
+ </includes>
+ <binaries>
+ <includeDependencies>false</includeDependencies>
+ <outputDirectory>examples</outputDirectory>
+ </binaries>
+ </moduleSet>
</moduleSets>
<fileSets>
<fileSet>
Deleted: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2011-04-12 19:33:16 UTC (rev 10495)
+++ trunk/examples/build.xml 2011-04-12 19:41:43 UTC (rev 10496)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent">
- ]>
-
-<!-- =========================================================================================== -->
-<!-- -->
-<!-- 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. -->
-<!-- -->
-<!-- =========================================================================================== -->
-
-
-<project default="clean" name="examples" basedir=".">
- <target name="clean">
- <subant target="clean" failonerror="true">
- <fileset dir="." excludes="build.xml" includes="**/build.xml" />
- </subant>
- </target>
-</project>
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2011-04-12 19:33:16 UTC (rev 10495)
+++ trunk/examples/pom.xml 2011-04-12 19:41:43 UTC (rev 10496)
@@ -25,14 +25,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
- <configuration>
- <archive>
- <manifestEntries>
- <HornetQ-Version>${HornetQ-Version}</HornetQ-Version>
- <HornetQ-SVN-URL>${HornetQ-SVN-URL}</HornetQ-SVN-URL>
- </manifestEntries>
- </archive>
- </configuration>
</plugin>
</plugins>
</build>
Copied: trunk/examples/src/main/resources/build.xml (from rev 10493, trunk/examples/build.xml)
===================================================================
--- trunk/examples/src/main/resources/build.xml (rev 0)
+++ trunk/examples/src/main/resources/build.xml 2011-04-12 19:41:43 UTC (rev 10496)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent">
+ ]>
+
+<!-- =========================================================================================== -->
+<!-- -->
+<!-- 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. -->
+<!-- -->
+<!-- =========================================================================================== -->
+
+
+<project default="clean" name="examples" basedir="../../../">
+ <target name="clean">
+ <subant target="clean" failonerror="true">
+ <fileset dir="../../../" excludes="build.xml" includes="**/build.xml" />
+ </subant>
+ </target>
+</project>
13 years, 2 months
JBoss hornetq SVN: r10495 - in trunk/examples: src/main/resources and 7 other directories.
by do-not-reply@jboss.org
Author: ataylor
Date: 2011-04-12 15:33:16 -0400 (Tue, 12 Apr 2011)
New Revision: 10495
Added:
trunk/examples/src/main/resources/common/
trunk/examples/src/main/resources/core/
trunk/examples/src/main/resources/javaee/
trunk/examples/src/main/resources/jms/
trunk/examples/src/main/resources/soak/
Removed:
trunk/examples/common/
trunk/examples/core/
trunk/examples/javaee/
trunk/examples/jms/
trunk/examples/soak/
Modified:
trunk/examples/src/main/resources/common/build.xml
trunk/examples/src/main/resources/common/common.css
trunk/examples/src/main/resources/common/src/org/hornetq/common/example/HornetQExample.java
trunk/examples/src/main/resources/core/microcontainer/build.xml
trunk/examples/src/main/resources/javaee/common/build.xml
trunk/examples/src/main/resources/javaee/ejb-jms-transaction/readme.html
trunk/examples/src/main/resources/javaee/servlet-ssl/readme.html
trunk/examples/src/main/resources/jms/ssl-enabled/readme.html
Log:
mavenised examples part 2
Modified: trunk/examples/src/main/resources/common/build.xml
===================================================================
--- trunk/examples/common/build.xml 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/examples/src/main/resources/common/build.xml 2011-04-12 19:33:16 UTC (rev 10495)
@@ -14,7 +14,7 @@
~ implied. See the License for the specific language governing
~ permissions and limitations under the License.
-->
-<project default="compile" name="example" basedir=".">
+<project default="compile" name="example" basedir="">
<property name="hornetq.run_script" value="false" />
@@ -164,7 +164,7 @@
<target name="clean-all">
<subant target="clean" failonerror="true">
- <fileset dir=".." includes="*/build.xml" excludes="common/build.xml"/>
+ <fileset dir="../" includes="*/build.xml" excludes="common/build.xml"/>
</subant>
</target>
@@ -188,7 +188,7 @@
<delete dir="./data" quiet="true"/>
<!-- large-message creates huge .dat files -->
<delete>
- <fileset dir=".">
+ <fileset dir="">
<include name="*.dat"/>
</fileset>
</delete>
@@ -196,7 +196,7 @@
<target name="all" description="Run all the examples">
<subant target="run" failonerror="true">
- <fileset dir="..">
+ <fileset dir="../">
<include name="core/*/build.xml"/>
<include name="jms/*/build.xml"/>
<exclude name="common/build.xml"/>
Modified: trunk/examples/src/main/resources/common/common.css
===================================================================
--- trunk/examples/common/common.css 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/examples/src/main/resources/common/common.css 2011-04-12 19:33:16 UTC (rev 10495)
@@ -1,5 +1,5 @@
body {
- background: url(./images/hornetQ-banner_final.png) top left no-repeat;
+ background: url(images/hornetQ-banner_final.png) top left no-repeat;
}
h1 {
Modified: trunk/examples/src/main/resources/common/src/org/hornetq/common/example/HornetQExample.java
===================================================================
--- trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/examples/src/main/resources/common/src/org/hornetq/common/example/HornetQExample.java 2011-04-12 19:33:16 UTC (rev 10495)
@@ -160,7 +160,7 @@
"FAILED::",
config,
debugServer,
- "hornetq-beans.xml");
+ "distribution/src/main/resources/config/stand-alone/non-clustered/hornetq-beans.xml");
}
protected void reStartServer(final int index) throws Exception
@@ -180,7 +180,7 @@
"FAILED::",
config,
debugServer,
- "hornetq-beans.xml");
+ "distribution/src/main/resources/config/stand-alone/non-clustered/hornetq-beans.xml");
}
protected void startServers() throws Exception
Modified: trunk/examples/src/main/resources/core/microcontainer/build.xml
===================================================================
--- trunk/examples/core/microcontainer/build.xml 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/examples/src/main/resources/core/microcontainer/build.xml 2011-04-12 19:33:16 UTC (rev 10495)
@@ -40,7 +40,7 @@
-->
</fileset>
<pathelement location="${classes.dir}"/>
- <pathelement location="./server0"/>
+ <pathelement location="server0"/>
</path>
<target name="run" depends="compile">
Modified: trunk/examples/src/main/resources/javaee/common/build.xml
===================================================================
--- trunk/examples/javaee/common/build.xml 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/examples/src/main/resources/javaee/common/build.xml 2011-04-12 19:33:16 UTC (rev 10495)
@@ -11,7 +11,7 @@
~ implied. See the License for the specific language governing
~ permissions and limitations under the License.
-->
-<project default="compile" name="javaeeexample" basedir=".">
+<project default="compile" name="javaeeexample" basedir="">
<dirname property="imported.basedir" file="${ant.file.javaeeexample}"/>
<property file="${imported.basedir}/config/ant.properties"/>
<property name="example.config.dir" value="config"/>
Modified: trunk/examples/src/main/resources/javaee/ejb-jms-transaction/readme.html
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/readme.html 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/examples/src/main/resources/javaee/ejb-jms-transaction/readme.html 2011-04-12 19:33:16 UTC (rev 10495)
@@ -42,7 +42,7 @@
<li>copy <a href="config/mysql-ds.xml"><code>mysql-ds.xml</a></code> to to the profile</li>
</ul>
- <p>MySQL is configured to connect to a <code>jbossdb</code> database using the <code>jboss</code>/<code>jboss</code> credentials<a href="#fn1" id="fnr1"><sup>1</sup></a>.
+ <p>MySQL is configured to connect to a <code>jbossdb</code> database using the <code>jboss</code>/<code>jboss</code> credentials<a href="readme.html#fn1" id="fnr1"><sup>1</sup></a>.
<p>MySQL configuration file defines two DataSources:</p>
<ul>
<li><code>DefaultDS</code>, the default DataSource (used to create a table from the example)</li>
@@ -229,7 +229,7 @@
<hr>
<ol>
- <li><a name="fn1">Steps to create the MySQL DB</a><a href="#fnr1">↩</a>
+ <li><a name="fn1">Steps to create the MySQL DB</a><a href="readme.html#fnr1">↩</a>
<ul>
<li>connect as root to MySQL: <code>mysql</code>
<li>create database jbossdb: <code>create database jbossdb;</code>
Modified: trunk/examples/src/main/resources/javaee/servlet-ssl/readme.html
===================================================================
--- trunk/examples/javaee/servlet-ssl/readme.html 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/examples/src/main/resources/javaee/servlet-ssl/readme.html 2011-04-12 19:33:16 UTC (rev 10495)
@@ -17,7 +17,7 @@
<h2>Example Configuration</h2>
<p>In the configuration, the hornetq.example.keystore is the key store file holding client certificate. The hornetq.example.truststore
- is the file for server to hold trusted client certificates. They are pre-generated for illustration purpose<a id="fnr1" href="#fn1"><sup>1</sup></a>.</p>
+ is the file for server to hold trusted client certificates. They are pre-generated for illustration purpose<a id="fnr1" href="readme.html#fn1"><sup>1</sup></a>.</p>
<h2>Example step-by-step</h2>
@@ -102,7 +102,7 @@
<hr>
<ol>
- <li><a id="fn1">The stores were generating using the following commands <a href="#fnr1">↩</a>:
+ <li><a id="fn1">The stores were generating using the following commands <a href="readme.html#fnr1">↩</a>:
<ul>
<li>create the keystore: <code>keytool -genkey -keystore hornetq.example.keystore -storepass hornetqexample</code>
<li>export the certificate: <code>keytool -export -keystore hornetq.example.keystore -file hornetq.cer</code>
Modified: trunk/examples/src/main/resources/jms/ssl-enabled/readme.html
===================================================================
--- trunk/examples/jms/ssl-enabled/readme.html 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/examples/src/main/resources/jms/ssl-enabled/readme.html 2011-04-12 19:33:16 UTC (rev 10495)
@@ -45,7 +45,7 @@
</p>
<p>In the configuration, the hornetq.example.keystore is the key store file holding client certificate. The hornetq.example.truststore
- is the file for server to hold trusted client certificates. They are pre-generated for illustration purpose<a id="fnr1" href="#fn1"><sup>1</sup></a>.</p>
+ is the file for server to hold trusted client certificates. They are pre-generated for illustration purpose<a id="fnr1" href="readme.html#fn1"><sup>1</sup></a>.</p>
<h2>Example step-by-step</h2>
@@ -127,7 +127,7 @@
<hr>
<ol>
- <li><a id="fn1">The stores were generating using the following commands <a href="#fnr1">↩</a>:
+ <li><a id="fn1">The stores were generating using the following commands <a href="readme.html#fnr1">↩</a>:
<ul>
<li>create the keystore: <code>keytool -genkey -keystore hornetq.example.keystore -storepass hornetqexample</code>
<li>export the certificate: <code>keytool -export -keystore hornetq.example.keystore -file hornetq.cer</code>
13 years, 2 months
JBoss hornetq SVN: r10494 - in trunk: distribution/src/main/assembly and 3 other directories.
by do-not-reply@jboss.org
Author: ataylor
Date: 2011-04-12 15:30:32 -0400 (Tue, 12 Apr 2011)
New Revision: 10494
Added:
trunk/examples/pom.xml
trunk/examples/src/
trunk/examples/src/main/
trunk/examples/src/main/resources/
Modified:
trunk/distribution/src/main/assembly/dep.xml
trunk/pom.xml
Log:
mavenised examples
Modified: trunk/distribution/src/main/assembly/dep.xml
===================================================================
--- trunk/distribution/src/main/assembly/dep.xml 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/distribution/src/main/assembly/dep.xml 2011-04-12 19:30:32 UTC (rev 10494)
@@ -126,7 +126,8 @@
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
</binaries>
- </moduleSet><!--
+ </moduleSet>
+ <!--
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
Added: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml (rev 0)
+++ trunk/examples/pom.xml 2011-04-12 19:30:32 UTC (rev 10494)
@@ -0,0 +1,40 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-pom</artifactId>
+ <version>2.2.3-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.hornetq</groupId>
+ <artifactId>hornetq-examples</artifactId>
+ <packaging>jar</packaging>
+ <name>HornetQ Examples</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.2</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <HornetQ-Version>${HornetQ-Version}</HornetQ-Version>
+ <HornetQ-SVN-URL>${HornetQ-SVN-URL}</HornetQ-SVN-URL>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-04-12 18:42:56 UTC (rev 10493)
+++ trunk/pom.xml 2011-04-12 19:30:32 UTC (rev 10494)
@@ -108,6 +108,7 @@
<module>hornetq-spring-integration</module>
<module>hornetq-service-sar</module>
<module>tests</module>
+ <module>examples</module>
<module>distribution</module>
</modules>
13 years, 2 months
JBoss hornetq SVN: r10493 - trunk.
by do-not-reply@jboss.org
Author: ataylor
Date: 2011-04-12 14:42:56 -0400 (Tue, 12 Apr 2011)
New Revision: 10493
Removed:
trunk/examples-eap/
Log:
removed eap examples
13 years, 2 months
JBoss hornetq SVN: r10492 - in trunk: src and 3 other directories.
by do-not-reply@jboss.org
Author: ataylor
Date: 2011-04-12 12:52:39 -0400 (Tue, 12 Apr 2011)
New Revision: 10492
Removed:
trunk/src/Hornetq.iml
trunk/tests/hornetq-tests.iml
trunk/tests/jms-tests/Jms-tests.iml
trunk/tests/jms-tests/hornetq-jms-tests.iml
trunk/tests/joram-tests/hornetq-joram-tests.iml
Modified:
trunk/hornetq.ipr
Log:
removed intellij projects for examples
Modified: trunk/hornetq.ipr
===================================================================
--- trunk/hornetq.ipr 2011-04-12 14:21:56 UTC (rev 10491)
+++ trunk/hornetq.ipr 2011-04-12 16:52:39 UTC (rev 10492)
@@ -618,12 +618,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/hornetq.iml" filepath="$PROJECT_DIR$/hornetq.iml" />
- <module fileurl="file://$PROJECT_DIR$/examples/core/hornetq-core-examples.iml" filepath="$PROJECT_DIR$/examples/core/hornetq-core-examples.iml" />
- <module fileurl="file://$PROJECT_DIR$/examples/javaee/hornetq-javaee-examples.iml" filepath="$PROJECT_DIR$/examples/javaee/hornetq-javaee-examples.iml" />
- <module fileurl="file://$PROJECT_DIR$/examples/jms/hornetq-jms-examples.iml" filepath="$PROJECT_DIR$/examples/jms/hornetq-jms-examples.iml" />
- <module fileurl="file://$PROJECT_DIR$/tests/jms-tests/hornetq-jms-tests.iml" filepath="$PROJECT_DIR$/tests/jms-tests/hornetq-jms-tests.iml" />
- <module fileurl="file://$PROJECT_DIR$/tests/joram-tests/hornetq-joram-tests.iml" filepath="$PROJECT_DIR$/tests/joram-tests/hornetq-joram-tests.iml" />
- <module fileurl="file://$PROJECT_DIR$/tests/hornetq-tests.iml" filepath="$PROJECT_DIR$/tests/hornetq-tests.iml" />
</modules>
</component>
<component name="ProjectResources">
Deleted: trunk/src/Hornetq.iml
===================================================================
--- trunk/src/Hornetq.iml 2011-04-12 14:21:56 UTC (rev 10491)
+++ trunk/src/Hornetq.iml 2011-04-12 16:52:39 UTC (rev 10492)
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/main" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="jars" level="project" />
- <orderEntry type="library" name="lib" level="project" />
- <orderEntry type="library" name="lib10" level="project" />
- <orderEntry type="library" name="lib3" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/org/twitter4j/lib/twitter4j-core.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="lib4" level="project" />
- <orderEntry type="library" name="lib7" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/org/jboss/metadata/lib/jboss-metadata.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="lib2" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/javax/xml/stream/lib/stax-api.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="lib5" level="project" />
- <orderEntry type="library" name="lib13" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/org/jboss/netty/lib/netty.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../thirdparty/org/jboss/integration/lib/jboss-transaction-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- </component>
-</module>
-
Deleted: trunk/tests/hornetq-tests.iml
===================================================================
--- trunk/tests/hornetq-tests.iml 2011-04-12 14:21:56 UTC (rev 10491)
+++ trunk/tests/hornetq-tests.iml 2011-04-12 16:52:39 UTC (rev 10492)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/unit-tests/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/integration-tests/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/unit-tests/src/main/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/integration-tests/src/main/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/soak-tests/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/stress-tests/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/timing-tests/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/concurrent-tests/src/test/java" isTestSource="true" />
- <sourceFolder url="file://$MODULE_DIR$/performance-tests/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/jms-tests" />
- <excludeFolder url="file://$MODULE_DIR$/joram-tests" />
- <excludeFolder url="file://$MODULE_DIR$/logs" />
- <excludeFolder url="file://$MODULE_DIR$/output" />
- <excludeFolder url="file://$MODULE_DIR$/tmpfiles" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="etc" level="project" />
- <orderEntry type="module" module-name="hornetq" />
- <orderEntry type="library" name="messaging_jars" level="project" />
- <orderEntry type="library" name="messaging-tests" level="project" />
- </component>
-</module>
-
Deleted: trunk/tests/jms-tests/Jms-tests.iml
===================================================================
--- trunk/tests/jms-tests/Jms-tests.iml 2011-04-12 14:21:56 UTC (rev 10491)
+++ trunk/tests/jms-tests/Jms-tests.iml 2011-04-12 16:52:39 UTC (rev 10492)
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../thirdparty/org/jboss/integration/lib/jboss-transaction-spi.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="lib6" level="project" />
- <orderEntry type="library" name="lib10" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../thirdparty/junit/lib/junit.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../thirdparty/org/jboss/metadata/lib/jboss-metadata.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="lib2" level="project" />
- <orderEntry type="library" name="lib9" level="project" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../thirdparty/org/jboss/naming/lib/jnpserver.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </orderEntry>
- <orderEntry type="library" name="lib4" level="project" />
- <orderEntry type="library" name="jars" level="project" />
- <orderEntry type="module" module-name="Hornetq" />
- </component>
-</module>
-
Deleted: trunk/tests/jms-tests/hornetq-jms-tests.iml
===================================================================
--- trunk/tests/jms-tests/hornetq-jms-tests.iml 2011-04-12 14:21:56 UTC (rev 10491)
+++ trunk/tests/jms-tests/hornetq-jms-tests.iml 2011-04-12 16:52:39 UTC (rev 10492)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/output" />
- <excludeFolder url="file://$MODULE_DIR$/src/org/jboss/test/messaging/jms/stress" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="hornetq" />
- <orderEntry type="library" name="messaging-jms-tests" level="project" />
- <orderEntry type="library" name="messaging_jars" level="project" />
- </component>
-</module>
-
Deleted: trunk/tests/joram-tests/hornetq-joram-tests.iml
===================================================================
--- trunk/tests/joram-tests/hornetq-joram-tests.iml 2011-04-12 14:21:56 UTC (rev 10491)
+++ trunk/tests/joram-tests/hornetq-joram-tests.iml 2011-04-12 16:52:39 UTC (rev 10492)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/output" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module" module-name="hornetq" />
- <orderEntry type="module" module-name="hornetq-tests" />
- <orderEntry type="library" name="messaging_jars" level="project" />
- <orderEntry type="library" name="messaging-joram-tests" level="project" />
- </component>
-</module>
-
13 years, 2 months