Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java Fri Nov 30 11:55:29 2012 @@ -36,15 +36,14 @@ import org.apache.qpid.management.common public class AddQueue { - public static void main(String[] args) { //Example: add 'newqueue' to the 'test' virtualhost and bind to the 'amq.direct' exchange //TODO: take these parameters as arguments - + addQueue("test", "amq.direct", "newqueue"); } - + private static JMXConnector getJMXConnection() throws Exception { //TODO: Take these parameters as main+method arguments @@ -52,52 +51,55 @@ public class AddQueue int port = 8999; String username = "admin"; String password = "admin"; - + Map<String, Object> env = new HashMap<String, Object>(); JMXServiceURL jmxUrl = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + host + ":" + port + "/jmxrmi"); //Add user credential's to environment map for RMIConnector startup. env.put(JMXConnector.CREDENTIALS, new String[] {username,password}); - + return JMXConnectorFactory.connect(jmxUrl, env); } - - public static boolean addQueue(String virHost, String exchName, String queueName) { + public static boolean addQueue(String virHost, String exchName, String queueName) + { JMXConnector jmxc = null; try { jmxc = getJMXConnection(); - + MBeanServerConnection mbsc = jmxc.getMBeanServerConnection(); ObjectName hostManagerObjectName = new ObjectName( "org.apache.qpid:" + "type=VirtualHost.VirtualHostManager," + - "VirtualHost=" + virHost + ",*"); + "VirtualHost=" + ObjectName.quote(virHost) + ",*"); Set<ObjectName> vhostManagers = mbsc.queryNames(hostManagerObjectName, null); - + if(vhostManagers.size() == 0) { + System.out.println("VirtualHostManager MBean wasnt found: " + virHost); + //The vhostManager MBean wasnt found, cant procede return false; } - + ManagedBroker vhostManager = (ManagedBroker) MBeanServerInvocationHandler.newProxyInstance( mbsc, (ObjectName) vhostManagers.toArray()[0], ManagedBroker.class, false); ObjectName customExchangeObjectName = new ObjectName( "org.apache.qpid:" + "type=VirtualHost.Exchange," + - "VirtualHost=" + virHost + "," + - "name=" + exchName + "," + - "ExchangeType=direct,*"); + "VirtualHost=" + ObjectName.quote(virHost) + "," + + "name=" + ObjectName.quote(exchName) + ",*"); Set<ObjectName> exchanges = mbsc.queryNames(customExchangeObjectName, null); - + if(exchanges.size() == 0) { + System.out.println("Exchange wasnt found: " + exchName); + //The exchange doesnt exist, cant procede. return false; } @@ -105,12 +107,14 @@ public class AddQueue //create the MBean proxy ManagedExchange managedExchange = (ManagedExchange) MBeanServerInvocationHandler.newProxyInstance( mbsc, (ObjectName) exchanges.toArray()[0], ManagedExchange.class, false); - + try { //create the new durable queue and bind it. vhostManager.createNewQueue(queueName, null, true); + System.out.println("Created queue: " + queueName); managedExchange.createNewBinding(queueName,queueName); + System.out.println("Bound queue to exchange: "+ exchName); } catch (Exception e) { @@ -126,7 +130,7 @@ public class AddQueue { System.out.println("Could not add queue due to error :" + e.getMessage()); e.printStackTrace(); - } + } finally { if(jmxc != null) @@ -141,9 +145,8 @@ public class AddQueue } } } - + return false; - } }
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml Fri Nov 30 11:55:29 2012 @@ -76,6 +76,7 @@ <property name="broker.log.prefix" value="BROKER: "/> <property name="broker.log.interleave" value="true"/> + <property name="module.jar" location="${build.lib}/${project.name}-${module.name}-${project.version}.jar"/> <property name="module.qpid.jar" location="${module.release.lib}/qpid-all.jar"/> <basename property="qpid.jar.name" file="${module.qpid.jar}"/> @@ -153,15 +154,6 @@ <pathelement location="${module.test.src}"/> </path> - <condition property="module.jar" - value="${build.plugins}/${project.name}-${module.name}-${project.version}.jar" - else="${build.lib}/${project.name}-${module.name}-${project.version}.jar"> - <and> - <isset property="module.plugin"/> - <istrue value="${module.plugin}"/> - </and> - </condition> - <property name="module.test.jar" location="${build.lib}/${project.name}-${module.name}-tests-${project.version}.jar"/> @@ -250,7 +242,7 @@ <mkdir dir="${build.etc}"/> <mkdir dir="${build.lib}"/> <mkdir dir="${build.results}"/> - <mkdir dir="${build.plugins}"/> + <mkdir dir="${build.lib.broker.plugins}"/> <mkdir dir="${module.classes}"/> <mkdir dir="${module.precompiled}"/> <mkdir dir="${module.api}"/> @@ -267,7 +259,7 @@ <arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/> <arg line="-u ${project.url}"/> <arg line="-g ${project.groupid}"/> - <arg line="-v ${project.version}${maven.version.suffix}"/> + <arg line="-v ${project.version.maven}${maven.version.suffix}"/> <arg line="-p qpid"/> <arg line='-m "${module.depends}"'/> <arg line="-a ${module.name}"/> @@ -399,8 +391,6 @@ <property name="QPID_HOME" value="${qpid.home}"/> <property name="QPID_WORK" value="${qpid.work}"/> <property name="broker.existing.qpid.work" value=""/> - <!-- Used by PluginTest --> - <property name="example.plugin.target" value="${project.root}/build/lib/plugins"/> <propertyset id="all.test.systemproperties"> <propertyref prefix="test"/> @@ -511,7 +501,7 @@ <target name="postbuild" description="run after a build"/> - <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild" description="compile and copy resources into build tree"/> + <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild,copy-broker-plugin-jars" description="compile and copy resources into build tree"/> <target name="jar.manifest" depends="compile, copy-module-metainf" if="module.manifest"> <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}"> @@ -525,6 +515,10 @@ </jar> </target> + <target name="copy-broker-plugin-jars" if="${broker.plugin}" description="copy broker plugins for use in release packaging"> + <copy file="${module.jar}" todir="${build.lib.broker.plugins}" failonerror="true"/> + </target> + <target name="copy-module-metainf" depends="copy-metainf-resources" if="module.src.resources.metainf.exists"> <copy todir="${module.metainf}" failonerror="true"> <fileset dir="${module.src.resources.metainf}"/> Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef Fri Nov 30 11:55:29 2012 @@ -18,7 +18,7 @@ # chartType=XYLINE -chartTitle=Impact of Message Size +chartTitle=Impact of Message Size Bytes/S chartSubtitle=Transient messages chartDescription=1P 1C, transient, auto-ack, with message payload between 256-262144 bytes. Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef Fri Nov 30 11:55:29 2012 @@ -18,7 +18,7 @@ # chartType=XYLINE -chartTitle=Impact of Message Size +chartTitle=Impact of Message Size Bytes/S chartSubtitle=Persistent messages chartDescription=1P 1C, persistent, auto-ack, with message payload between 256-262144 bytes. Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java Fri Nov 30 11:55:29 2012 @@ -41,14 +41,14 @@ public abstract class BaseChartBuilder i setBackgroundColour(chart); } - public void addSeriesAttributes(List<SeriesDefinition> series, SeriesStokeAndPaintAccessor stokeAndPaintAccessor) + protected void addSeriesAttributes(JFreeChart targetChart, List<SeriesDefinition> series, SeriesStrokeAndPaintApplier strokeAndPaintApplier) { for (int i = 0; i < series.size(); i++) { SeriesDefinition seriesDefinition = series.get(i); if (seriesDefinition.getSeriesColourName() != null) { - stokeAndPaintAccessor.setSeriesPaint(i, ColorFactory.toColour(seriesDefinition.getSeriesColourName())); + strokeAndPaintApplier.setSeriesPaint(i, ColorFactory.toColour(seriesDefinition.getSeriesColourName()), targetChart); } if (seriesDefinition.getStrokeWidth() != null) { @@ -56,7 +56,7 @@ public abstract class BaseChartBuilder i boolean dashed = seriesDefinition.getStrokeWidth() < 0; float width = Math.abs(seriesDefinition.getStrokeWidth()); BasicStroke stroke = buildStrokeOfWidth(width, dashed); - stokeAndPaintAccessor.setSeriesStroke(i, stroke); + strokeAndPaintApplier.setSeriesStroke(i, stroke, targetChart); } } } Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/CategoryDataSetBasedChartBuilder.java Fri Nov 30 11:55:29 2012 @@ -81,18 +81,18 @@ public abstract class CategoryDataSetBas chart.getCategoryPlot().getDomainAxis().setCategoryLabelPositions(CategoryLabelPositions.UP_45); addCommonChartAttributes(chart, chartingDefinition); - addSeriesAttributes(chartingDefinition.getSeries(), new SeriesStokeAndPaintAccessor() + addSeriesAttributes(chart, chartingDefinition.getSeries(), new SeriesStrokeAndPaintApplier() { @Override - public void setSeriesStroke(int seriesIndex, Stroke stroke) + public void setSeriesStroke(int seriesIndex, Stroke stroke, JFreeChart targetChart) { - chart.getCategoryPlot().getRenderer().setSeriesStroke(seriesIndex, stroke); + targetChart.getCategoryPlot().getRenderer().setSeriesStroke(seriesIndex, stroke); } @Override - public void setSeriesPaint(int seriesIndex, Color colour) + public void setSeriesPaint(int seriesIndex, Color colour, JFreeChart targetChart) { - chart.getCategoryPlot().getRenderer().setSeriesPaint(seriesIndex, colour); + targetChart.getCategoryPlot().getRenderer().setSeriesPaint(seriesIndex, colour); } }); Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactory.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactory.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactory.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/ColorFactory.java Fri Nov 30 11:55:29 2012 @@ -23,7 +23,6 @@ import java.awt.Color; public class ColorFactory { - /** * Converts a colour name known to the JDK into a {@link Color} instance. Additionally, * if the work dark_ is prepended to the colour, a darker shade of the same colour is @@ -52,7 +51,7 @@ public class ColorFactory } } - protected static Color getColourFromStaticField(String colourName) + private static Color getColourFromStaticField(String colourName) { try { Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java Fri Nov 30 11:55:29 2012 @@ -92,18 +92,18 @@ public class StatisticalBarCharBuilder e chart.getCategoryPlot().getDomainAxis().setCategoryLabelPositions(CategoryLabelPositions.UP_45); addCommonChartAttributes(chart, chartingDefinition); - addSeriesAttributes(chartingDefinition.getSeries(), new SeriesStokeAndPaintAccessor() + addSeriesAttributes(chart, chartingDefinition.getSeries(), new SeriesStrokeAndPaintApplier() { @Override - public void setSeriesStroke(int seriesIndex, Stroke stroke) + public void setSeriesStroke(int seriesIndex, Stroke stroke, JFreeChart targetChart) { - chart.getCategoryPlot().getRenderer().setSeriesStroke(seriesIndex, stroke); + targetChart.getCategoryPlot().getRenderer().setSeriesStroke(seriesIndex, stroke); } @Override - public void setSeriesPaint(int seriesIndex, Color colour) + public void setSeriesPaint(int seriesIndex, Color colour, JFreeChart targetChart) { - chart.getCategoryPlot().getRenderer().setSeriesPaint(seriesIndex, colour); + targetChart.getCategoryPlot().getRenderer().setSeriesPaint(seriesIndex, colour); } }); Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/XYDataSetBasedChartBuilder.java Fri Nov 30 11:55:29 2012 @@ -98,18 +98,18 @@ public abstract class XYDataSetBasedChar dataset, PLOT_ORIENTATION, SHOW_LEGEND, SHOW_TOOL_TIPS, SHOW_URLS); addCommonChartAttributes(chart, chartingDefinition); - addSeriesAttributes(chartingDefinition.getSeries(), new SeriesStokeAndPaintAccessor() + addSeriesAttributes(chart, chartingDefinition.getSeries(), new SeriesStrokeAndPaintApplier() { @Override - public void setSeriesStroke(int seriesIndex, Stroke stroke) + public void setSeriesStroke(int seriesIndex, Stroke stroke, JFreeChart targetChart) { - chart.getXYPlot().getRenderer().setSeriesStroke(seriesIndex, stroke); + targetChart.getXYPlot().getRenderer().setSeriesStroke(seriesIndex, stroke); } @Override - public void setSeriesPaint(int seriesIndex, Color colour) + public void setSeriesPaint(int seriesIndex, Color colour, JFreeChart targetChart) { - chart.getXYPlot().getRenderer().setSeriesPaint(seriesIndex, colour); + targetChart.getXYPlot().getRenderer().setSeriesPaint(seriesIndex, colour); } }); Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/client/ssl/SSLTest.java Fri Nov 30 11:55:29 2012 @@ -28,6 +28,7 @@ import static org.apache.qpid.test.utils import org.apache.commons.configuration.ConfigurationException; import org.apache.qpid.client.AMQConnectionURL; import org.apache.qpid.client.AMQTestConnection_0_10; +import org.apache.qpid.jms.ConnectionURL; import org.apache.qpid.test.utils.QpidBrokerTestCase; import javax.jms.Connection; @@ -78,6 +79,54 @@ public class SSLTest extends QpidBrokerT } } + /** + * Create an SSL connection using the SSL system properties for the trust and key store, but using + * the {@link ConnectionURL} ssl='true' option to indicate use of SSL at a Connection level, + * without specifying anything at the {@link ConnectionURL#OPTIONS_BROKERLIST} level. + */ + public void testSslConnectionOption() throws Exception + { + if (shouldPerformTest()) + { + //Start the broker (NEEDing client certificate authentication) + configureJavaBrokerIfNecessary(true, true, true, false); + super.setUp(); + + //Create URL enabling SSL at the connection rather than brokerlist level + String url = "amqp://guest:guest@test/?ssl='true'&brokerlist='tcp://localhost:%s'"; + url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT); + + Connection con = getConnection(new AMQConnectionURL(url)); + assertNotNull("connection should be successful", con); + Session ssn = con.createSession(false,Session.AUTO_ACKNOWLEDGE); + assertNotNull("create session should be successful", ssn); + } + } + + /** + * Create an SSL connection using the SSL system properties for the trust and key store, but using + * the {@link ConnectionURL} ssl='true' option to indicate use of SSL at a Connection level, + * overriding the false setting at the {@link ConnectionURL#OPTIONS_BROKERLIST} level. + */ + public void testSslConnectionOptionOverridesBrokerlistOption() throws Exception + { + if (shouldPerformTest()) + { + //Start the broker (NEEDing client certificate authentication) + configureJavaBrokerIfNecessary(true, true, true, false); + super.setUp(); + + //Create URL enabling SSL at the connection, overriding the false at the brokerlist level + String url = "amqp://guest:guest@test/?ssl='true'&brokerlist='tcp://localhost:%s?ssl='false''"; + url = String.format(url,QpidBrokerTestCase.DEFAULT_SSL_PORT); + + Connection con = getConnection(new AMQConnectionURL(url)); + assertNotNull("connection should be successful", con); + Session ssn = con.createSession(false,Session.AUTO_ACKNOWLEDGE); + assertNotNull("create session should be successful", ssn); + } + } + public void testCreateSSLConnectionUsingSystemProperties() throws Exception { if (shouldPerformTest()) Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1411034-1415148 Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java Fri Nov 30 11:55:29 2012 @@ -206,13 +206,41 @@ public class QueueManagementTest extends managedBroker.createNewQueue(queueName, null, true, arguments); // Ensure the queue exists - assertNotNull("Queue object name expected to exist", _jmxUtils.getQueueObjectName("test", queueName)); + assertNotNull("Queue object name expected to exist", _jmxUtils.getQueueObjectName(VIRTUAL_HOST, queueName)); assertNotNull("Manager queue expected to be available", _jmxUtils.getManagedQueue(queueName)); final ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName); assertEquals("Unexpected maximum delivery count", deliveryCount, managedQueue.getMaximumDeliveryCount()); } + public void testCreateQueueWithAlertingThresholdsSet() throws Exception + { + final String queueName = getName(); + final ManagedBroker managedBroker = _jmxUtils.getManagedBroker(VIRTUAL_HOST); + + final Long maximumMessageCount = 100l; + final Long maximumMessageSize = 200l; + final Long maximumQueueDepth = 300l; + final Long maximumMessageAge = 400l; + final Map<String, Object> arguments = new HashMap<String, Object>(); + arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_COUNT, maximumMessageCount); + arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_SIZE, maximumMessageSize); + arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_QUEUE_DEPTH, maximumQueueDepth); + arguments.put(AMQQueueFactory.X_QPID_MAXIMUM_MESSAGE_AGE, maximumMessageAge); + + managedBroker.createNewQueue(queueName, null, true, arguments); + + // Ensure the queue exists + assertNotNull("Queue object name expected to exist", _jmxUtils.getQueueObjectName(VIRTUAL_HOST, queueName)); + assertNotNull("Manager queue expected to be available", _jmxUtils.getManagedQueue(queueName)); + + ManagedQueue managedQueue = _jmxUtils.getManagedQueue(queueName); + assertEquals("Unexpected maximum message count", maximumMessageCount, managedQueue.getMaximumMessageCount()); + assertEquals("Unexpected maximum message size", maximumMessageSize, managedQueue.getMaximumMessageSize()); + assertEquals("Unexpected maximum queue depth", maximumQueueDepth, managedQueue.getMaximumQueueDepth()); + assertEquals("Unexpected maximum message age", maximumMessageAge, managedQueue.getMaximumMessageAge()); + } + /** * Requires 0-10 as relies on ADDR addresses. * @see AddressBasedDestinationTest for the testing of message routing to the alternate exchange Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/SaslRestTest.java Fri Nov 30 11:55:29 2012 @@ -20,13 +20,42 @@ */ package org.apache.qpid.systest.rest; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; import java.util.List; import java.util.Map; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.configuration.ConfigurationException; +import org.apache.qpid.tools.security.Passwd; +import org.codehaus.jackson.JsonParseException; +import org.codehaus.jackson.map.JsonMappingException; + public class SaslRestTest extends QpidRestTestCase { - public void testGet() throws Exception + @Override + public void startBroker() + { + // prevent broker from starting in setUp + } + + public void startBrokerNow() throws Exception { + super.startBroker(); + } + + public void testGetMechanismsWithBrokerPlainPasswordPrincipalDatabase() throws Exception + { + startBrokerNow(); + Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/rest/sasl"); assertNotNull("mechanisms attribute is not found", saslData.get("mechanisms")); @@ -37,6 +66,365 @@ public class SaslRestTest extends QpidRe { assertTrue("Mechanism " + mechanism + " is not found", mechanisms.contains(mechanism)); } + assertNull("Unexpected user was returned", saslData.get("user")); + } + + public void testGetMechanismsWithBrokerBase64MD5FilePrincipalDatabase() throws Exception + { + configureBase64MD5FilePrincipalDatabase(); + startBrokerNow(); + + Map<String, Object> saslData = getRestTestHelper().getJsonAsMap("/rest/sasl"); + assertNotNull("mechanisms attribute is not found", saslData.get("mechanisms")); + + @SuppressWarnings("unchecked") + List<String> mechanisms = (List<String>) saslData.get("mechanisms"); + String[] expectedMechanisms = { "CRAM-MD5-HEX", "CRAM-MD5-HASHED" }; + for (String mechanism : expectedMechanisms) + { + assertTrue("Mechanism " + mechanism + " is not found", mechanisms.contains(mechanism)); + } + assertNull("Unexpected user was returned", saslData.get("user")); + } + + public void testPlainSaslAuthenticationForValidCredentials() throws Exception + { + startBrokerNow(); + + byte[] responseBytes = generatePlainClientResponse("admin", "admin"); + String responseData = Base64.encodeBase64String(responseBytes); + String parameters= "mechanism=PLAIN&response=" + responseData; + + HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + OutputStream os = connection.getOutputStream(); + os.write(parameters.getBytes()); + os.flush(); + + int code = connection.getResponseCode(); + assertEquals("Unexpected response code", 200, code); + + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertEquals("Unexpected user", "admin", response2.get("user")); + } + + public void testPlainSaslAuthenticationForIncorrectPassword() throws Exception + { + startBrokerNow(); + + byte[] responseBytes = generatePlainClientResponse("admin", "incorrect"); + String responseData = Base64.encodeBase64String(responseBytes); + String parameters= "mechanism=PLAIN&response=" + responseData; + + HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + OutputStream os = connection.getOutputStream(); + os.write(parameters.getBytes()); + os.flush(); + + int code = connection.getResponseCode(); + assertEquals("Unexpected response code", 403, code); + + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertNull("Unexpected user", response2.get("user")); + } + + public void testPlainSaslAuthenticationForNonExistingUser() throws Exception + { + startBrokerNow(); + + byte[] responseBytes = generatePlainClientResponse("nonexisting", "admin"); + String responseData = Base64.encodeBase64String(responseBytes); + String parameters= "mechanism=PLAIN&response=" + responseData; + + HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + OutputStream os = connection.getOutputStream(); + os.write(parameters.getBytes()); + os.flush(); + + int code = connection.getResponseCode(); + assertEquals("Unexpected response code", 403, code); + + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertNull("Unexpected user", response2.get("user")); + } + + public void testCramMD5SaslAuthenticationForValidCredentials() throws Exception + { + startBrokerNow(); + + // request the challenge for CRAM-MD5 + HttpURLConnection connection = requestSasServerChallenge("CRAM-MD5"); + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // authenticate user with correct credentials + int code = authenticateUser(connection, "admin", "admin", "CRAM-MD5"); + assertEquals("Unexpected response code", 200, code); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertEquals("Unexpected user", "admin", response2.get("user")); + } + + public void testCramMD5SaslAuthenticationForIncorrectPassword() throws Exception + { + startBrokerNow(); + + // request the challenge for CRAM-MD5 + HttpURLConnection connection = requestSasServerChallenge("CRAM-MD5"); + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // authenticate user with correct credentials + int code = authenticateUser(connection, "admin", "incorrect", "CRAM-MD5"); + assertEquals("Unexpected response code", 403, code); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertNull("Unexpected user", response2.get("user")); + } + + public void testCramMD5SaslAuthenticationForNonExistingUser() throws Exception + { + startBrokerNow(); + + // request the challenge for CRAM-MD5 + HttpURLConnection connection = requestSasServerChallenge("CRAM-MD5"); + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // authenticate user with correct credentials + int code = authenticateUser(connection, "nonexisting", "admin", "CRAM-MD5"); + assertEquals("Unexpected response code", 403, code); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertNull("Unexpected user", response2.get("user")); + } + + public void testCramMD5HexSaslAuthenticationForValidCredentials() throws Exception + { + configureBase64MD5FilePrincipalDatabase(); + startBrokerNow(); + + // request the challenge for CRAM-MD5-HEX + HttpURLConnection connection = requestSasServerChallenge("CRAM-MD5-HEX"); + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // authenticate user with correct credentials + int code = authenticateUser(connection, "admin", "admin", "CRAM-MD5-HEX"); + assertEquals("Unexpected response code", 200, code); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertEquals("Unexpected user", "admin", response2.get("user")); + } + + public void testCramMD5HexSaslAuthenticationForIncorrectPassword() throws Exception + { + configureBase64MD5FilePrincipalDatabase(); + startBrokerNow(); + + HttpURLConnection connection = requestSasServerChallenge("CRAM-MD5-HEX"); + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // try to authenticate user with incorrect passowrd + int code = authenticateUser(connection, "admin", "incorrect", "CRAM-MD5-HEX"); + assertEquals("Unexpected response code", 403, code); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertNull("Unexpected user", response2.get("user")); + } + + public void testCramMD5HexSaslAuthenticationForNonExistingUser() throws Exception + { + configureBase64MD5FilePrincipalDatabase(); + startBrokerNow(); + + HttpURLConnection connection = requestSasServerChallenge("CRAM-MD5-HEX"); + List<String> cookies = connection.getHeaderFields().get("Set-Cookie"); + + // try to authenticate non-existing user + int code = authenticateUser(connection, "nonexisting", "admin", "CRAM-MD5-HEX"); + assertEquals("Unexpected response code", 403, code); + + // request authenticated user details + connection = getRestTestHelper().openManagementConnection("/rest/sasl", "GET"); + applyCookiesToConnection(cookies, connection); + Map<String, Object> response2 = getRestTestHelper().readJsonResponseAsMap(connection); + assertNull("Unexpected user", response2.get("user")); + } + + private HttpURLConnection requestSasServerChallenge(String mechanism) throws IOException + { + HttpURLConnection connection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + OutputStream os = connection.getOutputStream(); + os.write(("mechanism=" + mechanism).getBytes()); + os.flush(); + return connection; + } + + private int authenticateUser(HttpURLConnection requestChallengeConnection, String userName, String userPassword, String mechanism) + throws IOException, JsonParseException, JsonMappingException, Exception + { + // get the response + Map<String, Object> response = getRestTestHelper().readJsonResponseAsMap(requestChallengeConnection); + String challenge = (String) response.get("challenge"); + assertNotNull("Challenge is not found", challenge); + + // preserve cookies to have the same server session + List<String> cookies = requestChallengeConnection.getHeaderFields().get("Set-Cookie"); + + // generate the authentication response for the challenge received + byte[] challengeBytes = Base64.decodeBase64(challenge); + byte[] responseBytes = generateClientResponse(mechanism, userName, userPassword, challengeBytes); + String responseData = Base64.encodeBase64String(responseBytes); + String requestParameters = ("id=" + response.get("id") + "&response=" + responseData); + + // re-open connection + HttpURLConnection authenticateConnection = getRestTestHelper().openManagementConnection("/rest/sasl", "POST"); + + // set cookies to use the same server session + applyCookiesToConnection(cookies, authenticateConnection); + OutputStream os = authenticateConnection.getOutputStream(); + os.write(requestParameters.getBytes()); + os.flush(); + return authenticateConnection.getResponseCode(); + } + + private byte[] generateClientResponse(String mechanism, String userName, String userPassword, byte[] challengeBytes) throws Exception + { + byte[] responseBytes = null; + if ("CRAM-MD5-HEX".equalsIgnoreCase(mechanism)) + { + responseBytes = generateCramMD5HexClientResponse(userName, userPassword, challengeBytes); + } + else if ("CRAM-MD5".equalsIgnoreCase(mechanism)) + { + responseBytes = generateCramMD5ClientResponse(userName, userPassword, challengeBytes); + } + else + { + throw new RuntimeException("Not implemented test mechanism " + mechanism); + } + return responseBytes; } + private void applyCookiesToConnection(List<String> cookies, HttpURLConnection connection) + { + for (String cookie : cookies) + { + connection.addRequestProperty("Cookie", cookie.split(";", 2)[0]); + } + } + + private static byte SEPARATOR = 0; + + private byte[] generatePlainClientResponse(String userName, String userPassword) throws Exception + { + byte[] password = userPassword.getBytes("UTF8"); + byte user[] = userName.getBytes("UTF8"); + byte response[] = new byte[password.length + user.length + 2 ]; + int size = 0; + response[size++] = SEPARATOR; + System.arraycopy(user, 0, response, size, user.length); + size += user.length; + response[size++] = SEPARATOR; + System.arraycopy(password, 0, response, size, password.length); + return response; + } + + private byte[] generateCramMD5HexClientResponse(String userName, String userPassword, byte[] challengeBytes) throws Exception + { + String macAlgorithm = "HmacMD5"; + byte[] digestedPasswordBytes = MessageDigest.getInstance("MD5").digest(userPassword.getBytes("UTF-8")); + byte[] hexEncodedDigestedPasswordBytes = toHex(digestedPasswordBytes).getBytes("UTF-8"); + Mac mac = Mac.getInstance(macAlgorithm); + mac.init(new SecretKeySpec(hexEncodedDigestedPasswordBytes, macAlgorithm)); + final byte[] messageAuthenticationCode = mac.doFinal(challengeBytes); + String responseAsString = userName + " " + toHex(messageAuthenticationCode); + return responseAsString.getBytes(); + } + + private byte[] generateCramMD5ClientResponse(String userName, String userPassword, byte[] challengeBytes) throws Exception + { + String macAlgorithm = "HmacMD5"; + Mac mac = Mac.getInstance(macAlgorithm); + mac.init(new SecretKeySpec(userPassword.getBytes("UTF-8"), macAlgorithm)); + final byte[] messageAuthenticationCode = mac.doFinal(challengeBytes); + String responseAsString = userName + " " + toHex(messageAuthenticationCode); + return responseAsString.getBytes(); + } + + private String toHex(byte[] data) + { + StringBuffer hash = new StringBuffer(); + for (int i = 0; i < data.length; i++) + { + String hex = Integer.toHexString(0xFF & data[i]); + if (hex.length() == 1) + { + hash.append('0'); + } + hash.append(hex); + } + return hash.toString(); + } + + private void configureBase64MD5FilePrincipalDatabase() throws IOException, ConfigurationException + { + // generate user password entry + String passwordFileEntry; + try + { + passwordFileEntry = new Passwd().getOutput("admin", "admin"); + } + catch (NoSuchAlgorithmException e) + { + throw new ConfigurationException(e); + } + + // store the entry in the file + File passwordFile = File.createTempFile("passwd", "pwd"); + passwordFile.deleteOnExit(); + + FileWriter writer = null; + try + { + writer = new FileWriter(passwordFile); + writer.write(passwordFileEntry); + } + finally + { + writer.close(); + } + + // configure broker to use Base64MD5PasswordFilePrincipalDatabase + setConfigurationProperty("security.pd-auth-manager.principal-database.class", + "org.apache.qpid.server.security.auth.database.Base64MD5PasswordFilePrincipalDatabase"); + setConfigurationProperty("security.pd-auth-manager.principal-database.attributes.attribute.value", passwordFile.getAbsolutePath()); + setConfigurationProperty("management.http.sasl-auth", "true"); + } } Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java Fri Nov 30 11:55:29 2012 @@ -286,9 +286,7 @@ public class JMXTestUtils public ObjectName getQueueObjectName(String virtualHostName, String queue) { // Get the name of the test manager - String query = "org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" - + ObjectName.quote(virtualHostName) + ",name=" - + ObjectName.quote(queue) + ",*"; + String query = getQueueObjectNameString(virtualHostName, queue); Set<ObjectName> objectNames = queryObjects(query); @@ -301,6 +299,12 @@ public class JMXTestUtils return objectName; } + public String getQueueObjectNameString(String virtualHostName, String queue) { + return "org.apache.qpid:type=VirtualHost.Queue,VirtualHost=" + + ObjectName.quote(virtualHostName) + ",name=" + + ObjectName.quote(queue) + ",*"; + } + /** * Generate the ObjectName for the given Exchange on a VirtualHost. */ Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles:r1411034-1415148 Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/CPPExcludes URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/CPPExcludes?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/CPPExcludes (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/CPPExcludes Fri Nov 30 11:55:29 2012 @@ -181,3 +181,7 @@ org.apache.qpid.client.failover.Multiple // Uses Java broker specific configuration org.apache.qpid.client.ssl.SSLTest#testClientCertMissingWhilstWanting + +// QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based +org.apache.qpid.client.HeartbeatTest#testReadOnlyConnectionHeartbeats + Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/CPPExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1411034-1415148 Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/Java010Excludes URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/Java010Excludes?rev=1415591&r1=1415590&r2=1415591&view=diff ============================================================================== --- qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/Java010Excludes (original) +++ qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/Java010Excludes Fri Nov 30 11:55:29 2012 @@ -64,3 +64,6 @@ org.apache.qpid.client.failover.AddressB // QPID-3604: Immediate Prefetch no longer supported by 0-10 org.apache.qpid.client.AsynchMessageListenerTest#testImmediatePrefetchWithMessageListener + +// QPID-2796 : Java 0-10 client only sends heartbeats in response to heartbeats from the server, not timeout based +org.apache.qpid.client.HeartbeatTest#testReadOnlyConnectionHeartbeats Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/JavaBDBExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/JavaExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/JavaPre010Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/JavaTransientExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/XAExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.async.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.cluster.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.noprefetch.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.ssl.excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.ssl.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/cpp.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-bdb.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-dby.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/java-mms.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/log4j-test.xml ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/test-provider.properties ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/test_resources/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1411034-1415148 Propchange: qpid/branches/java-broker-config-qpid-4390/qpid/java/test-profiles/testprofile.defaults ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1411034-1415148 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
