You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/02/07 18:38:24 UTC
svn commit: r1782048 [12/12] - in /qpid: java/trunk/ java/trunk/bdbstore/
java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
java/trunk/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/
java/trunk/bdbstore/sr...
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/client/session/QueueDeleteTest.java Tue Feb 7 18:38:14 2017
@@ -29,7 +29,7 @@ import javax.jms.Session;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
public class QueueDeleteTest extends QpidBrokerTestCase
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java Tue Feb 7 18:38:14 2017
@@ -34,7 +34,7 @@ import javax.jms.JMSException;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.jms.ConnectionListener;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
/**
@@ -177,10 +177,25 @@ public abstract class AbstractACLTestCas
{
assertNotNull("There was no linked exception", t);
assertTrue("Wrong linked exception type : " + t.getClass(), t instanceof AMQException);
- assertEquals("Incorrect error code received", 403, ((AMQException) t).getErrorCode());
+ assertAMQException("Incorrect error code received", 403, ((AMQException) t));
//use the latch to ensure the control thread waits long enough for the exception thread
//to have done enough to mark the connection closed before teardown commences
- assertTrue("Timed out waiting for conneciton to report close", _exceptionReceived.await(2, TimeUnit.SECONDS));
+ assertTrue("Timed out waiting for connection to report close", _exceptionReceived.await(2, TimeUnit.SECONDS));
+ }
+
+ protected void assertAMQException(final String message, final int expected, final AMQException e)
+ {
+ Object object = e.getErrorCode(); // API change after v6.1
+ if (object instanceof Integer)
+ {
+ assertEquals(message, expected, e.getErrorCode());
+ }
+ else
+ {
+ final String fullMessage = String.format("%s. expected actual : %s to start with %d", message, e.getErrorCode(), expected);
+ final String actual = String.valueOf(e.getErrorCode());
+ assertTrue(fullMessage, actual.startsWith(Integer.toString(expected)));
+ }
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java Tue Feb 7 18:38:14 2017
@@ -27,7 +27,7 @@ import org.apache.qpid.QpidException;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
/**
* ACL version 2/3 file testing to verify that ACL entries control queue creation with specific properties.
@@ -87,7 +87,7 @@ public class ExhaustiveACLTest extends A
}
catch (AMQException e)
{
- assertEquals("Should be an ACCESS_REFUSED error", 403, e.getErrorCode());
+ assertAMQException("Should be an ACCESS_REFUSED error", 403, e);
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLTest.java Tue Feb 7 18:38:14 2017
@@ -35,7 +35,7 @@ import org.apache.qpid.QpidException;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.url.URLSyntaxException;
/**
@@ -85,7 +85,7 @@ public class ExternalACLTest extends Abs
assertNotNull("Cause was null", cause);
assertTrue("Wrong linked exception type", cause instanceof QpidException);
int errorCode = isBroker010() ? ErrorCodes.CONNECTION_FORCED : ErrorCodes.ACCESS_REFUSED;
- assertEquals("Incorrect error code received", errorCode, ((AMQException) cause).getErrorCode());
+ assertAMQException("Incorrect error code received", errorCode, (AMQException)cause);
}
public void setUpAccessVirtualHostWithName() throws Exception
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Tue Feb 7 18:38:14 2017
@@ -36,13 +36,13 @@ import javax.security.auth.Subject;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.qpid.common.AMQPFilterTypes;
-import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.MessagePublishInfo;
+import org.apache.qpid.server.common.AMQPFilterTypes;
+import org.apache.qpid.server.exchange.ExchangeDefaults;
+import org.apache.qpid.server.framing.AMQShortString;
+import org.apache.qpid.server.framing.BasicContentHeaderProperties;
+import org.apache.qpid.server.framing.ContentHeaderBody;
+import org.apache.qpid.server.framing.FieldTable;
+import org.apache.qpid.server.framing.MessagePublishInfo;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.connection.SessionPrincipal;
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/amqp/AmqpManagementTest.java Tue Feb 7 18:38:14 2017
@@ -31,6 +31,7 @@ import java.util.UUID;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
+import javax.jms.ConnectionMetaData;
import javax.jms.JMSException;
import javax.jms.MapMessage;
import javax.jms.Message;
@@ -53,6 +54,7 @@ public class AmqpManagementTest extends
private Queue _replyConsumer;
private MessageConsumer _consumer;
private MessageProducer _producer;
+ private boolean _runTest = true;
private void setupSession() throws Exception
{
@@ -67,6 +69,10 @@ public class AmqpManagementTest extends
}
else
{
+ final ConnectionMetaData metaData = _connection.getMetaData();
+ // TODO: Qpid JMS Client 0-x didn't suppport these addresses.
+ _runTest = !( metaData.getProviderMajorVersion() < 6 || (metaData.getProviderMajorVersion() == 6 && metaData.getProviderMinorVersion() <= 1));
+ getLogger().debug("Run test {}", _runTest);
_queue = _session.createQueue("ADDR:$management");
_replyAddress = _session.createQueue("ADDR:!response");
_replyConsumer = _session.createQueue(
@@ -96,6 +102,10 @@ public class AmqpManagementTest extends
public void testGetTypesOnBrokerManagement() throws Exception
{
setupBrokerManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
Message message = _session.createBytesMessage();
@@ -163,6 +173,12 @@ public class AmqpManagementTest extends
{
setupBrokerManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
+
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("identity", "self");
@@ -245,6 +261,11 @@ public class AmqpManagementTest extends
{
setupVirtualHostManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
+
Message message = _session.createBytesMessage();
message.setStringProperty("identity", "self");
@@ -279,6 +300,11 @@ public class AmqpManagementTest extends
{
setupBrokerManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.Queue");
@@ -357,6 +383,11 @@ public class AmqpManagementTest extends
{
setupVirtualHostManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.Queue");
@@ -466,6 +497,11 @@ public class AmqpManagementTest extends
public void testReadVirtualHost() throws Exception
{
setupVirtualHostManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.VirtualHost");
@@ -497,6 +533,11 @@ public class AmqpManagementTest extends
public void testCreateVirtualHost() throws Exception
{
setupBrokerManagementConnection();
+
+ if (!_runTest)
+ {
+ return;
+ }
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.JsonVirtualHostNode");
@@ -540,6 +581,11 @@ public class AmqpManagementTest extends
public void testDeleteVirtualHost() throws Exception
{
setupVirtualHostManagementConnection();
+
+ if (!_runTest)
+ {
+ return;
+ }
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.VirtualHost");
@@ -560,6 +606,11 @@ public class AmqpManagementTest extends
public void testCreateQueueWithQpidType() throws Exception
{
setupVirtualHostManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.Queue");
@@ -584,6 +635,12 @@ public class AmqpManagementTest extends
public void testCreateQueueWithAmqpType() throws Exception
{
setupVirtualHostManagementConnection();
+
+ if (!_runTest)
+ {
+ return;
+ }
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.SortedQueue");
@@ -608,6 +665,12 @@ public class AmqpManagementTest extends
public void testCreateExchangeWithoutType() throws Exception
{
setupVirtualHostManagementConnection();
+
+ if (!_runTest)
+ {
+ return;
+ }
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.Exchange");
@@ -631,6 +694,11 @@ public class AmqpManagementTest extends
public void testCreateConnectionOnVhostManagement() throws Exception
{
setupVirtualHostManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.Connection");
@@ -651,6 +719,11 @@ public class AmqpManagementTest extends
public void testCreateConnectionOnBrokerManagement() throws Exception
{
setupBrokerManagementConnection();
+ if (!_runTest)
+ {
+ return;
+ }
+
MapMessage message = _session.createMapMessage();
message.setStringProperty("type", "org.apache.qpid.Connection");
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/BrokerRestTest.java Tue Feb 7 18:38:14 2017
@@ -29,7 +29,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import org.apache.qpid.configuration.CommonProperties;
+import org.apache.qpid.server.configuration.CommonProperties;
import org.apache.qpid.server.management.plugin.servlet.rest.AbstractServlet;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.BrokerModel;
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/UnroutableMessageTestExceptionListener.java Tue Feb 7 18:38:14 2017
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQNoConsumersException;
import org.apache.qpid.client.AMQNoRouteException;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
/**
* Provides utility methods for checking exceptions that are thrown on the client side when a message is
@@ -120,7 +120,7 @@ public class UnroutableMessageTestExcept
AMQException noRouteException = (AMQException) exception.getLinkedException();
assertNotNull("AMQException should be linked to JMSException", noRouteException);
- assertEquals(ErrorCodes.NO_ROUTE, noRouteException.getErrorCode());
+ assertAMQException("Unexpected error code", ErrorCodes.NO_ROUTE, noRouteException);
assertTrue(
"Linked exception " + noRouteException + " message should contain intended queue name",
noRouteException.getMessage().contains(intendedQueueName));
@@ -138,4 +138,20 @@ public class UnroutableMessageTestExcept
assertNotNull("JMSException is expected", exception);
return exception;
}
+
+ private void assertAMQException(final String message, final int expected, final AMQException e)
+ {
+ Object object = e.getErrorCode(); // API change after v6.1
+ if (object instanceof Integer)
+ {
+ assertEquals(message, expected, e.getErrorCode());
+ }
+ else
+ {
+ final String fullMessage = String.format("%s. expected actual : %s to start with %d", message, e.getErrorCode(), expected);
+ final String actual = String.valueOf(e.getErrorCode());
+ assertTrue(fullMessage, actual.startsWith(Integer.toString(expected)));
+ }
+ }
+
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/destination/AddressBasedDestinationTest.java Tue Feb 7 18:38:14 2017
@@ -56,7 +56,7 @@ import org.apache.qpid.client.AMQSession
import org.apache.qpid.client.message.QpidMessageProperties;
import org.apache.qpid.jndi.PropertiesFileInitialContextFactory;
import org.apache.qpid.messaging.Address;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.test.utils.BrokerHolder;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.transport.ExecutionErrorCode;
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/queue/QueuePolicyTest.java Tue Feb 7 18:38:14 2017
@@ -83,7 +83,7 @@ public class QueuePolicyTest extends Qpi
}
catch (AMQException e)
{
- assertEquals("The correct error code is not set",506, e.getErrorCode());
+ assertAMQException("The correct error code is not set", 506, e);
}
}
@@ -117,4 +117,20 @@ public class QueuePolicyTest extends Qpi
msg = (TextMessage)consumer.receive(1000);
assertEquals("The consumer should receive the msg with body='Test3'","Test3",msg.getText());
}
+
+ protected void assertAMQException(final String message, final int expected, final AMQException e)
+ {
+ Object object = e.getErrorCode(); // API change after v6.1
+ if (object instanceof Integer)
+ {
+ assertEquals(message, expected, e.getErrorCode());
+ }
+ else
+ {
+ final String fullMessage = String.format("%s. expected actual : %s to start with %d", message, e.getErrorCode(), expected);
+ final String actual = String.valueOf(e.getErrorCode());
+ assertTrue(fullMessage, actual.startsWith(Integer.toString(expected)));
+ }
+ }
+
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/AMQSessionTest.java Tue Feb 7 18:38:14 2017
@@ -24,10 +24,11 @@ import javax.jms.Connection;
import javax.jms.Session;
import org.apache.qpid.AMQChannelClosedException;
+import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQDestination;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -85,7 +86,22 @@ public class AMQSessionTest extends Qpid
}
catch(AMQChannelClosedException cce)
{
- assertEquals(ErrorCodes.NOT_FOUND, cce.getErrorCode());
+ assertAMQException("Unexpected error code", ErrorCodes.NOT_FOUND, cce);
+ }
+ }
+
+ private void assertAMQException(final String message, final int expected, final AMQException e)
+ {
+ Object object = e.getErrorCode(); // API change after v6.1
+ if (object instanceof Integer)
+ {
+ assertEquals(message, expected, e.getErrorCode());
+ }
+ else
+ {
+ final String fullMessage = String.format("%s. expected actual : %s to start with %d", message, e.getErrorCode(), expected);
+ final String actual = String.valueOf(e.getErrorCode());
+ assertTrue(fullMessage, actual.startsWith(Integer.toString(expected)));
}
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java Tue Feb 7 18:38:14 2017
@@ -36,7 +36,7 @@ import javax.jms.Session;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.systest.rest.RestTestHelper;
@@ -216,7 +216,7 @@ public class DynamicQueueExchangeCreateT
Exception linked = original.getLinkedException();
assertNotNull("Linked exception should have been set", linked);
assertTrue("Linked exception should be an AMQProtocolException", linked instanceof AMQException);
- assertEquals("Error code should be " + code, code, ((AMQException) linked).getErrorCode());
+ assertAMQException("Error code should be " + code, code, ((AMQException) linked));
}
public void testAutoDeleteExchangeDeclarationByProducer() throws Exception
@@ -305,4 +305,19 @@ public class DynamicQueueExchangeCreateT
return false;
}
}
+ protected void assertAMQException(final String message, final int expected, final AMQException e)
+ {
+ Object object = e.getErrorCode(); // API change after v6.1
+ if (object instanceof Integer)
+ {
+ assertEquals(message, expected, e.getErrorCode());
+ }
+ else
+ {
+ final String fullMessage = String.format("%s. expected actual : %s to start with %d", message, e.getErrorCode(), expected);
+ final String actual = String.valueOf(e.getErrorCode());
+ assertTrue(fullMessage, actual.startsWith(Integer.toString(expected)));
+ }
+ }
+
}
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/message/JMSHeaderTest.java Tue Feb 7 18:38:14 2017
@@ -20,6 +20,7 @@
package org.apache.qpid.test.unit.message;
import javax.jms.Connection;
+import javax.jms.ConnectionMetaData;
import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Queue;
@@ -33,6 +34,14 @@ public class JMSHeaderTest extends QpidB
public void testResentJMSMessageGetsReplacementJMSMessageID() throws Exception
{
Connection con = getConnection();
+ final ConnectionMetaData metaData = con.getMetaData();
+
+ if ( metaData.getProviderMajorVersion() < 6 || (metaData.getProviderMajorVersion() == 6 && metaData.getProviderMinorVersion() <= 1))
+ {
+ // TODO This defect was fixed after 6.1
+ return;
+ }
+
con.start();
Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTestCase.java Tue Feb 7 18:38:14 2017
@@ -24,6 +24,8 @@ import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
@@ -40,7 +42,7 @@ import junit.framework.TestCase;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQSession;
-import org.apache.qpid.protocol.ErrorCodes;
+import org.apache.qpid.server.protocol.ErrorCodes;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.util.LogMonitor;
@@ -231,7 +233,21 @@ public abstract class TransactionTimeout
if (jmse.getLinkedException() instanceof AMQException)
{
- _linkedExceptionCode = ((AMQException) jmse.getLinkedException()).getErrorCode();
+ final AMQException amqException = (AMQException) jmse.getLinkedException();
+ Object object = amqException.getErrorCode(); // API change after v6.1
+ if (object instanceof Integer)
+ {
+ _linkedExceptionCode = (int) object;
+ }
+ else
+ {
+ final Pattern compile = Pattern.compile("(\\d+)(:.*)");
+ final String input = String.valueOf(object);
+ final Matcher matcher = compile.matcher(input);
+ matcher.find();
+ _linkedExceptionCode = Integer.parseInt(matcher.group(1));
+ }
+
}
_exceptionCount.incrementAndGet();
_exceptionListenerLatch.countDown();
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java Tue Feb 7 18:38:14 2017
@@ -38,12 +38,12 @@ import com.fasterxml.jackson.databind.Ob
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.bytebuffer.QpidByteBuffer;
+import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.configuration.ClientProperties;
-import org.apache.qpid.framing.HeartbeatBody;
-import org.apache.qpid.framing.ProtocolInitiation;
-import org.apache.qpid.framing.ProtocolVersion;
+import org.apache.qpid.server.configuration.ClientProperties;
+import org.apache.qpid.server.framing.HeartbeatBody;
+import org.apache.qpid.server.framing.ProtocolInitiation;
+import org.apache.qpid.server.framing.ProtocolVersion;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
@@ -51,7 +51,9 @@ import org.apache.qpid.server.model.port
import org.apache.qpid.server.protocol.v0_10.ServerDisassembler;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
-import org.apache.qpid.transport.network.Frame;
+import org.apache.qpid.server.transport.network.Frame;
+import org.apache.qpid.server.transport.ConnectionHeartbeat;
+import org.apache.qpid.server.transport.ByteBufferSender;
public class ProtocolNegotiationTest extends QpidBrokerTestCase
{
@@ -282,7 +284,7 @@ public class ProtocolNegotiationTest ext
setTestSystemProperty(ClientProperties.AMQP_VERSION, version);
AMQConnection connection = (AMQConnection)getConnection();
LOGGER.debug("Negotiated version {}", connection.getProtocolVersion());
- assertEquals("Unexpected version negotiated: " + connection.getProtocolVersion(), convertProtocolToProtocolVersion(_expectedProtocolInit), connection.getProtocolVersion());
+ assertEquals("Unexpected version negotiated: " + connection.getProtocolVersion(), convertProtocolToProtocolVersion(_expectedProtocolInit).toString(), connection.getProtocolVersion().toString());
connection.close();
}
}
Modified: qpid/java/trunk/test-profiles/JavaExcludes
URL: http://svn.apache.org/viewvc/qpid/java/trunk/test-profiles/JavaExcludes?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/test-profiles/JavaExcludes (original)
+++ qpid/java/trunk/test-profiles/JavaExcludes Tue Feb 7 18:38:14 2017
@@ -25,4 +25,4 @@ org.apache.qpid.test.client.queue.QueueP
org.apache.qpid.test.client.queue.QueuePolicyTest#testRejectPolicy
// Test runs for 2 minutes testing that subtraction works
-org.apache.qpid.util.SerialTest#testCorollary1
\ No newline at end of file
+org.apache.qpid.server.util.SerialTest#testCorollary1
\ No newline at end of file
Modified: qpid/java/trunk/tools/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/tools/pom.xml?rev=1782048&r1=1782047&r2=1782048&view=diff
==============================================================================
--- qpid/java/trunk/tools/pom.xml (original)
+++ qpid/java/trunk/tools/pom.xml Tue Feb 7 18:38:14 2017
@@ -32,7 +32,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-client</artifactId>
- <version>${project.version}</version>
+ <version>${qpid-jms-client-ampq-0-x-version}</version>
</dependency>
<dependency>
Modified: qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml (original)
+++ qpid/qpid-jms-amqp-0-x/trunk/client/pom.xml Tue Feb 7 18:38:14 2017
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-java-build</artifactId>
+ <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
<version>7.0.0-SNAPSHOT</version>
</parent>
@@ -30,16 +30,14 @@
<properties>
<dependency-change-verification>true</dependency-change-verification>
+ <qpid.name>qpid</qpid.name>
+ <qpid.version>${project.version}</qpid.version>
+ <qpid.version.suffix />
+ <buildNumber>Unversioned directory</buildNumber>
</properties>
<dependencies>
<dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_1.1_spec</artifactId>
<version>${geronimo-jms-1-1-version}</version>
@@ -55,12 +53,19 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-test-utils</artifactId>
+ <artifactId>qpid-jms-amqp-0-x-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava-version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback-version}</version>
@@ -73,6 +78,7 @@
<resources>
<resource>
<directory>src/main/resources</directory>
+ <filtering>true</filtering>
</resource>
<resource>
<directory>src/main/java</directory>
@@ -80,16 +86,10 @@
<exclude>**/*.java/</exclude>
</excludes>
</resource>
- </resources>
+ </resources>
<testResources>
<testResource>
- <directory>${basedir}/../</directory>
- <includes>
- <include>test-profiles/**/*.jks</include>
- </includes>
- </testResource>
- <testResource>
<directory>${basedir}/src/test/java</directory>
<excludes>
<exclude>**/*.java/</exclude>
@@ -102,6 +102,23 @@
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<!--version specified in parent pluginManagement -->
@@ -132,4 +149,41 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>generate-sources-client</id>
+ <activation>
+ <property>
+ <name>generate</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <!--version specified in parent pluginManagement -->
+ <executions>
+ <execution>
+ <id>jms-selector-generated</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${selector.output.dir}</outputDirectory>
+ <sourceDirectory>src/main/grammar</sourceDirectory>
+ <includes>
+ <include>SelectorParser.jj</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: qpid/qpid-jms-amqp-0-x/trunk/client/src/main/java/org/apache/qpid/configuration/CommonProperties.java
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/client/src/main/java/org/apache/qpid/configuration/CommonProperties.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/qpid-jms-amqp-0-x/trunk/client/src/main/java/org/apache/qpid/configuration/CommonProperties.java (original)
+++ qpid/qpid-jms-amqp-0-x/trunk/client/src/main/java/org/apache/qpid/configuration/CommonProperties.java Tue Feb 7 18:38:14 2017
@@ -71,7 +71,7 @@ public class CommonProperties
public static final String QPID_SECURITY_OBJECT_MESSAGE_CLASS_HIERARCHY_BLACK_LIST = "qpid.security.objectMessage.classHierarchyBlackList";
/** The name of the version properties file to load from the class path. */
- public static final String VERSION_RESOURCE = "qpidversion.properties";
+ public static final String VERSION_RESOURCE = "qpidclientversion.properties";
/** Defines the name of the product property. */
public static final String PRODUCT_NAME_PROPERTY = "qpid.name";
Added: qpid/qpid-jms-amqp-0-x/trunk/doc/pom.xml
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/doc/pom.xml?rev=1782048&view=auto
==============================================================================
--- qpid/qpid-jms-amqp-0-x/trunk/doc/pom.xml (added)
+++ qpid/qpid-jms-amqp-0-x/trunk/doc/pom.xml Tue Feb 7 18:38:14 2017
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF 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.
+ ~
+ -->
+<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.apache.qpid</groupId>
+ <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>qpid-java-doc</artifactId>
+ <name>Apache Qpid JMS AMQP 0-x Docbook</name>
+ <description>Apache Qpid JMS AMQP 0-x Docbook</description>
+ <packaging>pom</packaging>
+
+ <properties>
+ <jar.skipIfEmpty>true</jar.skipIfEmpty>
+ <maven.install.skip>true</maven.install.skip>
+
+ <docbook.src>${project.basedir}/src/docbkx</docbook.src>
+ <docbook.target.filtered>${basedir}/target/filtered-docbkx</docbook.target.filtered>
+ <docbook.target>${basedir}/target/docbkx</docbook.target>
+
+ <qpidDownloadUrlDesc>the Apache Qpid project web site</qpidDownloadUrlDesc>
+ <qpidDownloadUrl>http://qpid.apache.org/download.html</qpidDownloadUrl>
+
+ <qpidJavaBrokerBook>../../java-broker/book/</qpidJavaBrokerBook>
+ <qpidJmsClient08Book>../../jms-client-0-8/book/</qpidJmsClient08Book>
+ <qpidJmsClient010Book>../../jms-client-0-10/book/</qpidJmsClient010Book>
+
+ <qpidCppBook>../../cpp-broker/book/</qpidCppBook>
+
+ <oracleJdkDocUrl>http://docs.oracle.com/javase/7/docs/api/</oracleJdkDocUrl>
+ <oracleJeeDocUrl>http://docs.oracle.com/javaee/6/api/</oracleJeeDocUrl>
+ <oracleKeytool>http://docs.oracle.com/javase/7/docs/technotes/tools/solaris/keytool.html</oracleKeytool>
+ <oracleJmsSpec>http://download.oracle.com/otndocs/jcp/7195-jms-1.1-fr-spec-oth-JSpec/</oracleJmsSpec>
+ <oracleJmsTutorial>http://docs.oracle.com/javaee/6/tutorial/doc/bncdq.html</oracleJmsTutorial>
+
+ <oracleJeDownloadUrl>http://www.oracle.com/technetwork/products/berkeleydb/downloads/index.html?ssSourceSiteId=ocomen</oracleJeDownloadUrl>
+ <oracleBdbRepGuideUrl>http://oracle.com/cd/E17277_02/html/ReplicationGuide/</oracleBdbRepGuideUrl>
+ <oracleBdbJavaDocUrl>http://docs.oracle.com/cd/E17277_02/html/java/</oracleBdbJavaDocUrl>
+
+ <qpidSrc>http://svn.apache.org/viewvc/qpid/java/trunk/</qpidSrc>
+ <qpidSrcSuffix>.java?view=co/</qpidSrcSuffix>
+
+ <qpidMavenRepoDesc>Maven repositories</qpidMavenRepoDesc>
+ <qpidClientGroupId>org.apache.qpid</qpidClientGroupId>
+ <qpidClientArtefactId>qpid-client</qpidClientArtefactId>
+
+ <amqpSrc>http://www.amqp.org</amqpSrc>
+ </properties>
+
+ <modules>
+ <module>jms-client-0-8</module>
+ <module>jms-client-0-10</module>
+ </modules>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter-docbook-sources</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <outputDirectory>${docbook.target.filtered}</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${docbook.src}</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <escapeString>\</escapeString>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.agilejava.docbkx</groupId>
+ <artifactId>docbkx-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>docbook-html</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate-xhtml</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
+ <version>${maven-docbook-xml-plugin-version}</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <sourceDirectory>${docbook.target.filtered}</sourceDirectory>
+ <targetDirectory>${docbook.target}</targetDirectory>
+ <xincludeSupported>true</xincludeSupported>
+ <chunkedOutput>true</chunkedOutput>
+ <showXslMessages>true</showXslMessages>
+ <xhtmlCustomization>../src/main/docbkx/docbook-xhtml.xsl</xhtmlCustomization>
+ <htmlStylesheet>./css/style.css</htmlStylesheet>
+ <customizationParameters>
+ <parameter>
+ <name>use.id.as.filename</name>
+ <value>1</value>
+ </parameter>
+ <parameter>
+ <name>section.autolabel</name>
+ <value>1</value>
+ </parameter>
+ <parameter>
+ <name>section.autolabel.max.depth</name>
+ <value>3</value>
+ </parameter>
+ <parameter>
+ <name>section.label.includes.component.label</name>
+ <value>1</value>
+ </parameter>
+ <parameter>
+ <name>callout.unicode</name>
+ <value>0</value>
+ </parameter>
+ </customizationParameters>
+ <preProcess>
+ <copy todir="${docbook.target}/images" failOnError="false">
+ <fileset dir="${docbook.src}/images" />
+ </copy>
+ <copy todir="${docbook.target}/css" failOnError="false">
+ <fileset dir="${project.basedir}/../src/main/docbkx/css" />
+ </copy>
+ </preProcess>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>${project.basedir}/../src/main/assembly/html.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ <appendAssemblyId>false</appendAssemblyId>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <skipAssembly>true</skipAssembly>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/pom.xml
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/pom.xml?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/pom.xml (original)
+++ qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/pom.xml Tue Feb 7 18:38:14 2017
@@ -20,12 +20,12 @@
<parent>
<groupId>org.apache.qpid</groupId>
- <artifactId>qpid-java-build</artifactId>
+ <artifactId>qpid-jms-amqp-0-x-parent</artifactId>
<version>7.0.0-SNAPSHOT</version>
</parent>
- <artifactId>qpid-test-utils</artifactId>
- <name>Apache Qpid Test Utilities</name>
+ <artifactId>qpid-jms-amqp-0-x-test-utils</artifactId>
+ <name>Apache Qpid JMS AMQP 0-x Test Utilities</name>
<description>Testing utilities</description>
<dependencies>
Modified: qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java
URL: http://svn.apache.org/viewvc/qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java?rev=1782048&r1=1781779&r2=1782048&view=diff
==============================================================================
--- qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java (original)
+++ qpid/qpid-jms-amqp-0-x/trunk/qpid-jms-amqp-0-x-test-utils/src/main/java/org/apache/qpid/test/utils/TestSSLConstants.java Tue Feb 7 18:38:14 2017
@@ -20,23 +20,19 @@ package org.apache.qpid.test.utils;
public interface TestSSLConstants
{
- String KEYSTORE = "test-profiles/test_resources/ssl/java_client_keystore.jks";
- String UNTRUSTED_KEYSTORE = "test-profiles/test_resources/ssl/java_client_untrusted_keystore.jks";
+ String KEYSTORE = "java_client_keystore.jks";
+ String UNTRUSTED_KEYSTORE = "java_client_untrusted_keystore.jks";
String KEYSTORE_PASSWORD = "password";
- String TRUSTSTORE = "test-profiles/test_resources/ssl/java_client_truststore.jks";
+ String TRUSTSTORE = "java_client_truststore.jks";
String TRUSTSTORE_PASSWORD = "password";
String CERT_ALIAS_APP1 = "app1";
String CERT_ALIAS_APP2 = "app2";
String CERT_ALIAS_UNTRUSTED_CLIENT = "untrusted_client";
- String BROKER_KEYSTORE = "test-profiles/test_resources/ssl/java_broker_keystore.jks";
- String BROKER_KEYSTORE_PASSWORD = "password";
- String BROKER_KEYSTORE_ALIAS = "rootca";
-
- String BROKER_PEERSTORE = "test-profiles/test_resources/ssl/java_broker_peerstore.jks";
+ String BROKER_PEERSTORE = "java_broker_peerstore.jks";
String BROKER_PEERSTORE_PASSWORD = "password";
- String BROKER_TRUSTSTORE = "test-profiles/test_resources/ssl/java_broker_truststore.jks";
+ String BROKER_TRUSTSTORE = "java_broker_truststore.jks";
String BROKER_TRUSTSTORE_PASSWORD = "password";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org