You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2009/10/05 16:34:42 UTC
svn commit: r821809 [3/3] - in /qpid/branches/java-broker-0-10/qpid/java: ./
broker/ broker/bin/ broker/src/main/java/org/apache/qpid/server/
broker/src/main/java/org/apache/qpid/server/configuration/
broker/src/main/java/org/apache/qpid/server/connect...
Propchange: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:443187-707694
+/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/client/MultipleJCAProviderRegistrationTest.java:805429-816261
Modified: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java?rev=821809&r1=821808&r2=821809&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java (original)
+++ qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java Mon Oct 5 14:34:39 2009
@@ -21,31 +21,37 @@
package org.apache.qpid.server.security.acl;
-import org.apache.qpid.AMQException;
-import org.apache.qpid.AMQConnectionFailureException;
-import org.apache.qpid.client.AMQAuthenticationException;
-import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.client.AMQSession;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.BasicConfigurator;
+import org.apache.log4j.Logger;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.client.*;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.jms.ConnectionListener;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
+import org.apache.qpid.AMQConnectionFailureException;
+import org.apache.qpid.AMQException;
import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.jms.ConnectionListener;
import org.apache.qpid.url.URLSyntaxException;
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
+import javax.jms.*;
import javax.jms.IllegalStateException;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
import javax.naming.NamingException;
+
import java.io.File;
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
-public class SimpleACLTest extends QpidTestCase implements ConnectionListener
+public class SimpleACLTest extends QpidTestCase implements ConnectionListener, ExceptionListener
{
+ private String BROKER = "vm://:"+ApplicationRegistry.DEFAULT_INSTANCE;//"tcp://localhost:5672";
+ private ArrayList<Exception> _thrownExceptions = new ArrayList<Exception>();
+ private CountDownLatch _awaitError = new CountDownLatch(51);
+
public void setUp() throws Exception
{
final String QPID_HOME = System.getProperty("QPID_HOME");
@@ -134,7 +140,7 @@
}
}
- public void testClientConsumeFromNamedQueueInvalid() throws NamingException
+ public void testClientConsumeFromNamedQueueInvalid() throws NamingException, Exception
{
try
{
@@ -183,7 +189,7 @@
}
}
- public void testClientCreateNamedQueue() throws NamingException, JMSException, AMQException
+ public void testClientCreateNamedQueue() throws NamingException, JMSException, AMQException, Exception
{
try
{
@@ -263,7 +269,7 @@
}
}
- public void testClientPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException
+ public void testClientPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException, Exception
{
try
{
@@ -271,41 +277,38 @@
((AMQConnection) conn).setConnectionListener(this);
- Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Session session = conn.createSession(true, Session.AUTO_ACKNOWLEDGE);
conn.start();
-
+ conn.setExceptionListener(this);
MessageProducer sender = ((AMQSession) session).createProducer(null);
- Queue queue = session.createQueue("Invalid");
-
+ Queue queue = session.createQueue("NewQueueThatIDoNotHaveRightsToPublishToo");
+
// Send a message that we will wait to be sent, this should give the broker time to close the connection
// before we finish this test. Message is set !immed !mand as the queue is invalid so want to test ACLs not
// queue existence.
((org.apache.qpid.jms.MessageProducer) sender).send(queue, session.createTextMessage("test"),
DeliveryMode.NON_PERSISTENT, 0, 0L, false, false, true);
- // Test the connection with a valid consumer
- // This may fail as the session may be closed before the queue or the consumer created.
- Queue temp = session.createTemporaryQueue();
-
- session.createConsumer(temp).close();
-
- //Connection should now be closed and will throw the exception caused by the above send
- conn.close();
-
- fail("Close is not expected to succeed.");
+ _awaitError.await(1, TimeUnit.SECONDS);
}
catch (JMSException e)
{
- Throwable cause = e.getLinkedException();
- if (!(cause instanceof AMQAuthenticationException))
+ fail("Unknown exception thrown:" + e.getMessage());
+ }
+ boolean foundCorrectException = false;
+ for (Exception cause : _thrownExceptions)
+ {
+ if (cause instanceof JMSException)
{
- e.printStackTrace();
+ if (((JMSException) cause).getLinkedException() instanceof AMQAuthenticationException)
+ {
+ foundCorrectException = true;
+ }
}
- assertEquals("Incorrect exception", AMQAuthenticationException.class, cause.getClass());
- assertEquals("Incorrect error code thrown", 403, ((AMQAuthenticationException) cause).getErrorCode().getCode());
}
+ assertTrue("Did not get AMQAuthenticationException thrown", foundCorrectException);
}
public void testServerConsumeFromNamedQueueValid() throws AMQException, URLSyntaxException
@@ -328,7 +331,7 @@
}
}
- public void testServerConsumeFromNamedQueueInvalid() throws AMQException, URLSyntaxException, NamingException
+ public void testServerConsumeFromNamedQueueInvalid() throws AMQException, URLSyntaxException, NamingException, Exception
{
try
{
@@ -353,7 +356,7 @@
}
}
- public void testServerConsumeFromTemporaryQueue() throws AMQException, URLSyntaxException, NamingException
+ public void testServerConsumeFromTemporaryQueue() throws AMQException, URLSyntaxException, NamingException, Exception
{
try
{
@@ -409,7 +412,7 @@
}
}
- public void testServerCreateNamedQueueInvalid() throws JMSException, URLSyntaxException, AMQException, NamingException
+ public void testServerCreateNamedQueueInvalid() throws JMSException, URLSyntaxException, AMQException, NamingException, Exception
{
try
{
@@ -431,7 +434,7 @@
}
}
- public void testServerCreateTemporaryQueueInvalid() throws NamingException
+ public void testServerCreateTemporaryQueueInvalid() throws NamingException, Exception
{
try
{
@@ -456,7 +459,7 @@
}
}
- public void testServerCreateAutoDeleteQueueInvalid() throws NamingException, JMSException, AMQException
+ public void testServerCreateAutoDeleteQueueInvalid() throws NamingException, JMSException, AMQException, Exception
{
Connection connection = null;
try
@@ -487,7 +490,7 @@
* @throws URLSyntaxException
* @throws JMSException
*/
- public void testServerPublishUsingTransactionSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException
+ public void testServerPublishUsingTransactionSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException, Exception
{
//Set up the Server
Connection serverConnection = getConnection("server", "guest");
@@ -567,7 +570,7 @@
}
}
- public void testServerPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException
+ public void testServerPublishInvalidQueueSuccess() throws AMQException, URLSyntaxException, JMSException, NamingException, Exception
{
try
{
@@ -642,4 +645,10 @@
public void failoverComplete()
{
}
+
+ public void onException(JMSException arg0)
+ {
+ _thrownExceptions.add(arg0);
+ _awaitError.countDown();
+ }
}
Modified: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java?rev=821809&r1=821808&r2=821809&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java (original)
+++ qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java Mon Oct 5 14:34:39 2009
@@ -20,27 +20,27 @@
*/
package org.apache.qpid.test.unit.client.protocol;
-import org.apache.mina.common.IoSession;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.protocol.AMQProtocolHandler;
import org.apache.qpid.client.protocol.AMQProtocolSession;
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.test.utils.QpidTestCase;
-import org.apache.qpid.test.utils.protocol.TestIoSession;
+import org.apache.qpid.transport.TestNetworkDriver;
+import org.apache.qpid.transport.NetworkDriver;
public class AMQProtocolSessionTest extends QpidTestCase
{
private static class AMQProtSession extends AMQProtocolSession
{
- public AMQProtSession(AMQProtocolHandler protocolHandler, IoSession protocolSession, AMQConnection connection)
+ public AMQProtSession(AMQProtocolHandler protocolHandler, AMQConnection connection)
{
- super(protocolHandler,protocolSession,connection);
+ super(protocolHandler,connection);
}
- public TestIoSession getMinaProtocolSession()
+ public TestNetworkDriver getNetworkDriver()
{
- return (TestIoSession) _minaProtocolSession;
+ return (TestNetworkDriver) _protocolHandler.getNetworkDriver();
}
public AMQShortString genQueueName()
@@ -63,8 +63,11 @@
{
super.setUp();
+ AMQConnection con = (AMQConnection) getConnection("guest", "guest");
+ AMQProtocolHandler protocolHandler = new AMQProtocolHandler(con);
+ protocolHandler.setNetworkDriver(new TestNetworkDriver());
//don't care about the values set here apart from the dummy IoSession
- _testSession = new AMQProtSession(null,new TestIoSession(), (AMQConnection) getConnection("guest", "guest"));
+ _testSession = new AMQProtSession(protocolHandler , con);
//initialise addresses for test and expected results
_port = 123;
@@ -81,20 +84,20 @@
AMQShortString testAddress;
//test address with / and ; chars which generateQueueName should removeKey
- _testSession.getMinaProtocolSession().setStringLocalAddress(_brokenAddress);
- _testSession.getMinaProtocolSession().setLocalPort(_port);
+ _testSession.getNetworkDriver().setLocalAddress(_brokenAddress);
+ _testSession.getNetworkDriver().setPort(_port);
testAddress = _testSession.genQueueName();
assertEquals("Failure when generating a queue exchange from an address with special chars",_generatedAddress,testAddress.toString());
//test empty address
- _testSession.getMinaProtocolSession().setStringLocalAddress(_emptyAddress);
+ _testSession.getNetworkDriver().setLocalAddress(_emptyAddress);
testAddress = _testSession.genQueueName();
assertEquals("Failure when generating a queue exchange from an empty address",_generatedAddress_2,testAddress.toString());
//test address with no special chars
- _testSession.getMinaProtocolSession().setStringLocalAddress(_validAddress);
+ _testSession.getNetworkDriver().setLocalAddress(_validAddress);
testAddress = _testSession.genQueueName();
assertEquals("Failure when generating a queue exchange from an address with no special chars",_generatedAddress_3,testAddress.toString());
Modified: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=821809&r1=821808&r2=821809&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java (original)
+++ qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java Mon Oct 5 14:34:39 2009
@@ -21,6 +21,8 @@
package org.apache.qpid.test.utils;
import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.naming.NamingException;
public class FailoverBaseCase extends QpidTestCase
{
@@ -62,7 +64,7 @@
* @return a connection
* @throws Exception
*/
- public Connection getConnection() throws Exception
+ public Connection getConnection() throws JMSException, NamingException
{
Connection conn =
(Boolean.getBoolean("profile.use_ssl"))?
Modified: qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=821809&r1=821808&r2=821809&view=diff
==============================================================================
--- qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Mon Oct 5 14:34:39 2009
@@ -958,7 +958,7 @@
return (AMQConnectionFactory) getInitialContext().lookup(factoryName);
}
- public Connection getConnection() throws Exception
+ public Connection getConnection() throws JMSException, NamingException
{
return getConnection("guest", "guest");
}
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/010Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -1 +1,3 @@
-/qpid/trunk/qpid/java/test-profiles/010Excludes:799241-820933
+/incubator/qpid/trunk/qpid/java/test-profiles/010Excludes:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/010Excludes:805429-816261
+/qpid/trunk/qpid/java/test-profiles/010Excludes:799241-805428,816234-820933
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/08Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -1 +1,3 @@
-/qpid/trunk/qpid/java/test-profiles/08Excludes:799241-820933
+/incubator/qpid/trunk/qpid/java/test-profiles/08Excludes:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/08Excludes:805429-816261
+/qpid/trunk/qpid/java/test-profiles/08Excludes:799241-805428,816234-820933
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -1 +1,3 @@
-/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:799241-820933
+/incubator/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-816261
+/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:799241-805428,816234-820933
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/08TransientExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -1 +1,3 @@
-/qpid/trunk/qpid/java/test-profiles/08TransientExcludes:799241-820933
+/incubator/qpid/trunk/qpid/java/test-profiles/08TransientExcludes:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/08TransientExcludes:805429-816261
+/qpid/trunk/qpid/java/test-profiles/08TransientExcludes:799241-805428,816234-820933
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -1 +1,3 @@
-/qpid/trunk/qpid/java/test-profiles/Excludes:799241-820933
+/incubator/qpid/trunk/qpid/java/test-profiles/Excludes:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/Excludes:805429-816261
+/qpid/trunk/qpid/java/test-profiles/Excludes:799241-805428,816234-820933
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -1 +1,3 @@
-/qpid/trunk/qpid/java/test-profiles/XAExcludes:799241-820933
+/incubator/qpid/trunk/qpid/java/test-profiles/XAExcludes:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/XAExcludes:805429-816261
+/qpid/trunk/qpid/java/test-profiles/XAExcludes:799241-805428,816234-820933
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/clean-dir
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/clean-dir:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/clean-dir:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.async.testprofile:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.cluster.testprofile:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.noprefetch.testprofile:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -1 +1,3 @@
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:799241-820933
+/incubator/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.excludes:805429-816261
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:799241-805428,816234-820933
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.testprofile:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.testprofile:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/default.testprofile:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/java.testprofile:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/log4j-test.xml:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/test-provider.properties:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/test-provider.properties:805429-816261
Propchange: qpid/branches/java-broker-0-10/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Oct 5 14:34:39 2009
@@ -0,0 +1,2 @@
+/incubator/qpid/trunk/qpid/java/test-profiles/test_resources:443187-726139
+/qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources:805429-816261
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org