Modified: qpid/branches/asyncstore/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java (original) +++ qpid/branches/asyncstore/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java Mon Aug 27 15:40:33 2012 @@ -33,6 +33,8 @@ import javax.net.ssl.SSLPeerUnverifiedEx import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; import javax.net.ssl.SSLSocket; + +import org.apache.qpid.configuration.CommonProperties; import org.apache.qpid.protocol.ProtocolEngine; import org.apache.qpid.protocol.ProtocolEngineFactory; import org.apache.qpid.transport.ConnectionSettings; @@ -47,7 +49,8 @@ import org.slf4j.LoggerFactory; public class IoNetworkTransport implements OutgoingNetworkTransport, IncomingNetworkTransport { private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(IoNetworkTransport.class); - private static final int TIMEOUT = 60000; + private static final int TIMEOUT = Integer.getInteger(CommonProperties.IO_NETWORK_TRANSPORT_TIMEOUT_PROP_NAME, + CommonProperties.IO_NETWORK_TRANSPORT_TIMEOUT_DEFAULT); private Socket _socket; private IoNetworkConnection _connection; @@ -75,7 +78,7 @@ public class IoNetworkTransport implemen InetAddress address = InetAddress.getByName(settings.getHost()); - _socket.connect(new InetSocketAddress(address, settings.getPort()), TIMEOUT); + _socket.connect(new InetSocketAddress(address, settings.getPort()), settings.getConnectTimeout()); } catch (SocketException e) {
Modified: qpid/branches/asyncstore/java/ivy.retrieve.xml URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/ivy.retrieve.xml?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/ivy.retrieve.xml (original) +++ qpid/branches/asyncstore/java/ivy.retrieve.xml Mon Aug 27 15:40:33 2012 @@ -74,7 +74,7 @@ <!-- The following are optional dependencies, for modules providing optional functionlity or for use in optional build/test steps. Their optional status is usually indicative of licences which are not compatible with the Apache Licence --> - <dependency org="com.sleepycat" name="je" rev="5.0.55" transitive="false" conf="bdbje"/> + <dependency org="com.sleepycat" name="je" rev="5.0.58" transitive="false" conf="bdbje"/> <dependency org="jfree" name="jfreechart" rev="1.0.13" transitive="false" conf="jfree"/> <dependency org="jfree" name="jcommon" rev="1.0.16" transitive="false" conf="jfree"/> <dependency org="net.sourceforge.csvjdbc" name="csvjdbc" rev="1.0.8" transitive="false" conf="csvjdbc"/> Modified: qpid/branches/asyncstore/java/ivysettings.retrieve.xml URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/ivysettings.retrieve.xml?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/ivysettings.retrieve.xml (original) +++ qpid/branches/asyncstore/java/ivysettings.retrieve.xml Mon Aug 27 15:40:33 2012 @@ -18,7 +18,6 @@ <property name="ivy.default.resolver" value="chain" override="false"/> <property name="ivy.localfs.root" value="${project.root}/localfs_repo" override="false"/> <property name="ivy.localfs.pattern" value="[artifact]-[revision](-[classifier]).[ext]" override="false"/> - <property name="ivy.m2repo.url" value="http://repo1.maven.org/maven2"; override="false"/> <settings defaultResolver="${ivy.default.resolver}"/> <resolvers> Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1368652-1375508 Modified: qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-AckModes.js URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-AckModes.js?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-AckModes.js (original) +++ qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-AckModes.js Mon Aug 27 15:40:33 2012 @@ -1,3 +1,23 @@ +/* + * + * 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. + * + */ var duration = 30000; var topicName = "topic://amq.topic/?routingkey='testTopic'"; @@ -30,6 +50,7 @@ var jsonObject = { { "_name": "Producer", "_destinationName": topicName, + "_deliveryMode": 1, "_maximumDuration": duration, "_startDelay": 2000 // gives the consumers time to implicitly create the topic } Modified: qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js (original) +++ qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-NumberOfConsumers.js Mon Aug 27 15:40:33 2012 @@ -1,3 +1,23 @@ +/* + * + * 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. + * + */ var jsonObject = { _tests:[] }; @@ -26,6 +46,7 @@ for(i=0; i < numbersOfConsumers.length ; { "_name": "Producer1", "_destinationName": topicName, + "_deliveryMode": 1, "_maximumDuration": duration, "_startDelay": 2000 // gives the consumers time to implicitly create the topic } Modified: qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-NumberOfTopics.js URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-NumberOfTopics.js?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-NumberOfTopics.js (original) +++ qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-NumberOfTopics.js Mon Aug 27 15:40:33 2012 @@ -1,3 +1,23 @@ +/* + * + * 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. + * + */ var jsonObject = { _tests:[] }; @@ -29,6 +49,7 @@ for(i=0; i < numbersOfTopics.length ; i+ { "_name": "Producer-__INDEX", "_destinationName": topicName, + "_deliveryMode": 1, "_maximumDuration": duration, "_startDelay": 2000 // gives the consumers time to implicitly create the topic } Modified: qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-Persistence.js URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-Persistence.js?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-Persistence.js (original) +++ qpid/branches/asyncstore/java/perftests/etc/testdefs/Topic-Persistence.js Mon Aug 27 15:40:33 2012 @@ -1,3 +1,23 @@ +/* + * + * 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. + * + */ var duration = 30000; var topicName = "topic://amq.topic/?routingkey='testTopic'"; Modified: qpid/branches/asyncstore/java/perftests/example/perftests.js URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/perftests/example/perftests.js?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/perftests/example/perftests.js (original) +++ qpid/branches/asyncstore/java/perftests/example/perftests.js Mon Aug 27 15:40:33 2012 @@ -1,4 +1,23 @@ - +/* + * + * 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. + * + */ var jsonObject = { _tests:[] }; Modified: qpid/branches/asyncstore/java/perftests/src/main/java/test-utils.js URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/perftests/src/main/java/test-utils.js?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/perftests/src/main/java/test-utils.js (original) +++ qpid/branches/asyncstore/java/perftests/src/main/java/test-utils.js Mon Aug 27 15:40:33 2012 @@ -1,3 +1,23 @@ +/* + * + * 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. + * + */ var QPID; if (!QPID) { QPID = {}; Modified: qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java (original) +++ qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java Mon Aug 27 15:40:33 2012 @@ -105,8 +105,17 @@ public class ChartWriter writer = new BufferedWriter(new FileWriter(summaryFile)); writer.write(htmlHeader); + + writer.write(" <ul>\n"); + for (File chartFile : _chartFiles) + { + writer.write(" <li><a href='#"+ chartFile.getName() +"'>" + chartFile.getName() + "</a></li>\n"); + } + writer.write(" </ul>\n"); + for (File chartFile : _chartFiles) { + writer.write(" <a name='" + chartFile.getName() + "'/>\n"); writer.write(" <img src='" + chartFile.getName() + "'/>\n"); } writer.write(htmlFooter); Modified: qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html (original) +++ qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html Mon Aug 27 15:40:33 2012 @@ -3,7 +3,13 @@ <title>Performance Charts</title> </head> <body> + <ul> + <li><a href='#chart1.png'>chart1.png</a></li> + <li><a href='#chart2.png'>chart2.png</a></li> + </ul> + <a name='chart1.png'/> <img src='chart1.png'/> + <a name='chart2.png'/> <img src='chart2.png'/> </body> </html> \ No newline at end of file Propchange: qpid/branches/asyncstore/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html ------------------------------------------------------------------------------ svn:executable = * Modified: qpid/branches/asyncstore/java/systests/etc/log.properties URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/systests/etc/log.properties?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/systests/etc/log.properties (original) +++ qpid/branches/asyncstore/java/systests/etc/log.properties Mon Aug 27 15:40:33 2012 @@ -1,2 +1,21 @@ +# +# 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. +# + com.sleepycat.je.util.FileHandler.level=ALL com.sleepycat.je.util.ConsoleHandler.level=ALL Propchange: qpid/branches/asyncstore/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:r1368652-1375508 Propchange: qpid/branches/asyncstore/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:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/CPPExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/JavaBDBExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/JavaExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/JavaPre010Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/JavaTransientExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/XAExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/cpp.async.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/cpp.cluster.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/cpp.noprefetch.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/cpp.ssl.excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/cpp.ssl.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/cpp.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/java-bdb-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/java-bdb.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/java-dby-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/java-dby.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/java-mms-spawn.0-10.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/java-mms-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/java-mms.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/log4j-test.xml ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1368652-1375508 Modified: qpid/branches/asyncstore/java/test-profiles/python_tests/Java010PythonExcludes URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/java/test-profiles/python_tests/Java010PythonExcludes?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/java/test-profiles/python_tests/Java010PythonExcludes (original) +++ qpid/branches/asyncstore/java/test-profiles/python_tests/Java010PythonExcludes Mon Aug 27 15:40:33 2012 @@ -58,6 +58,7 @@ qpid_tests.broker_0_10.dtx.DtxTests.test qpid_tests.broker_0_10.dtx.DtxTests.test_simple_prepare_rollback qpid_tests.broker_0_10.dtx.DtxTests.test_simple_rollback +qpid_tests.broker_0_10.new_api.GeneralTests.test_qpid_3481_acquired_to_alt_exchange_2_consumers ###### Java Broker defects ###### Propchange: qpid/branches/asyncstore/java/test-profiles/test-provider.properties ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/test_resources/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1368652-1375508 Propchange: qpid/branches/asyncstore/java/test-profiles/testprofile.defaults ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1368652-1375508 Propchange: qpid/branches/asyncstore/packaging/windows/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/packaging/windows:r1368652-1375508 Propchange: qpid/branches/asyncstore/python/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/python:r1368652-1375508 Propchange: qpid/branches/asyncstore/python/examples/api/spout ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/python/examples/api/spout:r1368652-1375508 Propchange: qpid/branches/asyncstore/python/qpid/concurrency.py ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/python/qpid/concurrency.py:r1368652-1375508 Modified: qpid/branches/asyncstore/python/qpid/util.py URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/python/qpid/util.py?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/python/qpid/util.py (original) +++ qpid/branches/asyncstore/python/qpid/util.py Mon Aug 27 15:40:33 2012 @@ -27,7 +27,7 @@ except ImportError: def __init__(self, sock, keyfile=None, certfile=None, trustfile=None): self.sock = sock - self.ssl = wrap_socket(sock, keyfile=keyfile, certfile=certfile, ca_certs=trustfile) + self.ssl = wrap_socket(sock, keyfile=keyfile, certfile=certfile) def recv(self, n): return self.ssl.read(n) Modified: qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py (original) +++ qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/alternate_exchange.py Mon Aug 27 15:40:33 2012 @@ -308,8 +308,6 @@ class AlternateExchangeTests(TestBase010 #create a queue using the intermediary as its alternate exchange: session.queue_declare(queue="delivery-queue", alternate_exchange="my-exchange", auto_delete=True) - #bind that queue to the dlq as well: - session.exchange_bind(exchange="dlq", queue="delivery-queue") #send it some messages: dp=self.session.delivery_properties(routing_key="delivery-queue") for m in ["One", "Two", "Three"]: @@ -349,5 +347,5 @@ class AlternateExchangeTests(TestBase010 def assertEmpty(self, queue): try: msg = queue.get(timeout=1) - self.fail("Queue not empty: " + msg) + self.fail("Queue not empty: " + str(msg)) except Empty: None Modified: qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/management.py URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/management.py?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/management.py (original) +++ qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/management.py Mon Aug 27 15:40:33 2012 @@ -498,7 +498,7 @@ class ManagementTest (TestBase010): session.queue_declare(queue="whatever", exclusive=True, auto_delete=True) def test_immediate_method(self): - url = "%s://%s:%d" % (self.broker.scheme or "amqp", self.broker.host, self.broker.port) + url = "%s://%s:%d" % (self.broker.scheme or "amqp", self.broker.host or "localhost", self.broker.port or 5672) conn = qpid.messaging.Connection(url) conn.open() sess = conn.session() @@ -659,7 +659,7 @@ class ManagementTest (TestBase010): self.assertEqual(rc.receive, True) # setup a connection & session to the broker - url = "%s://%s:%d" % (self.broker.scheme or "amqp", self.broker.host, self.broker.port) + url = "%s://%s:%d" % (self.broker.scheme or "amqp", self.broker.host or "localhost", self.broker.port or 5672) conn = qpid.messaging.Connection(url) conn.open() sess = conn.session() Modified: qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/msg_groups.py URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/msg_groups.py?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/msg_groups.py (original) +++ qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/msg_groups.py Mon Aug 27 15:40:33 2012 @@ -787,7 +787,7 @@ class MultiConsumerMsgGroupTests(Base): except Empty: pass assert count == 3 # non-A's - assert a_count == 2 # pending acquired message included in browse results + assert a_count == 1 # assumes the acquired message was not the one purged and regular browsers don't get acquired messages s1.acknowledge() # ack the consumed A-0 self.qmf_session.delBroker(self.qmf_broker) Modified: qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/new_api.py URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/new_api.py?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/new_api.py (original) +++ qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/new_api.py Mon Aug 27 15:40:33 2012 @@ -106,10 +106,10 @@ class GeneralTests(Base): self.assertEqual(rx_alt.available(), 0, "No messages should have been routed to the alt_exchange") - # Close sess1; This will cause the queue to be deleted + # Close sess1; This will cause the queue to be deleted and all its messages (including those acquired) to be reouted to the alternate exchange sess1.close() sleep(1) - self.assertEqual(rx_alt.available(), 2, "2 of the messages should have been routed to the alt_exchange") + self.assertEqual(rx_alt.available(), 5, "All the messages should have been routed to the alt_exchange") # Close sess2; This will cause the acquired messages to be requeued and routed to the alternate sess2.close() Modified: qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/priority.py URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/priority.py?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/priority.py (original) +++ qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/priority.py Mon Aug 27 15:40:33 2012 @@ -112,11 +112,11 @@ class PriorityTests (Base): #check all messages on the queue were received by the browser; don't relay on any specific ordering at present assert set([m.content for m in msgs]) == set([m.content for m in received]) - def ring_queue_check(self, msgs): + def ring_queue_check(self, msgs, count=10): """ Ensure that a ring queue removes lowest priority messages first. """ - snd = self.ssn.sender(address("priority-ring-queue", arguments="x-qpid-priorities:10, 'qpid.policy_type':ring, 'qpid.max_count':10"), + snd = self.ssn.sender(address("priority-ring-queue", arguments="x-qpid-priorities:10, 'qpid.policy_type':ring, 'qpid.max_count':%s" % count), durable=self.durable()) for m in msgs: snd.send(m) @@ -126,23 +126,31 @@ class PriorityTests (Base): while True: received.append(rcv.fetch(0)) except Empty: None - expected = [] - for m in msgs: - while len(expected) > 9: - expected=sorted_(expected, key=lambda x: priority_level(x.priority,10)) - expected.pop(0) - expected.append(m) - #print "sent %s; expected %s; got %s" % ([m.content for m in msgs], [m.content for m in expected], [m.content for m in received]) + expected = sorted_(msgs, key=lambda x: priority_level(x.priority,10))[len(msgs)-count:] + expected = sorted_(expected, key=lambda x: priority_level(x.priority,10), reverse=True) + #print "sent %s; expected %s; got %s" % ([m.priority for m in msgs], [m.priority for m in expected], [m.priority for m in received]) + #print "sent %s; expected %s; got %s" % ([m.content for m in msgs], [m.content for m in expected], [m.content for m in received]) assert [m.content for m in expected] == [m.content for m in received] def test_ring_queue_1(self): priorities = [4,5,3,6,9,9,2,9,2,9,9,1,9,9,9,3,3,3,9,9,3,9,3,9,9,9,9,9,9,2,3] - seq = content("msg") + seq = content("msg") self.ring_queue_check([Message(content=seq.next(), priority = p) for p in priorities]) def test_ring_queue_2(self): - priorities = [9,0,2,3,6,9,9,2,9,2,9,9,1,9,4,7,1,1,3,9,9,3,9,3,9,9,9,1,9,9,2,3,0,9] - seq = content("msg") + priorities = [9,0,2,3,6,3,4,2,9,2,9,9,1,9,4,7,1,1,3,9,7,3,9,3,9,1,5,1,9,7,2,3,0,9] + seq = content("msg") + self.ring_queue_check([Message(content=seq.next(), priority = p) for p in priorities]) + + def test_ring_queue_3(self): + #test case given for QPID-3866 + priorities = [8,9,5,1,2,2,3,4,9,7,8,9,9,2] + seq = content("msg") + self.ring_queue_check([Message(content=seq.next(), priority = p) for p in priorities], 5) + + def test_ring_queue_4(self): + priorities = [9,0,2,3,6,3,4,2,9,2,9,3,1,9,4,7,1,1,3,2,7,3,9,3,6,1,5,1,9,7,2,3,0,2] + seq = content("msg") self.ring_queue_check([Message(content=seq.next(), priority = p) for p in priorities]) def test_requeue(self): @@ -169,6 +177,7 @@ class PriorityTests (Base): for expected in sorted_(msgs, key=lambda m: priority_level(m.priority,10), reverse=True): msg = rcv.fetch(0) #print "expected priority %s got %s" % (expected.priority, msg.priority) + #print "expected content %s got %s" % (expected.content, msg.content) assert msg.content == expected.content self.ssn.acknowledge(msg) @@ -231,7 +240,7 @@ def sorted_(msgs, key=None, reverse=Fals Workaround lack of sorted builtin function in python 2.3 and lack of keyword arguments to list.sort() """ - temp = msgs + temp = [m for m in msgs] temp.sort(key_to_cmp(key, reverse=reverse)) return temp Modified: qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/threshold.py URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/threshold.py?rev=1377715&r1=1377714&r2=1377715&view=diff ============================================================================== --- qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/threshold.py (original) +++ qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_10/threshold.py Mon Aug 27 15:40:33 2012 @@ -41,7 +41,7 @@ class ThresholdTests (Base): snd.send(m) count = count + 1 size = size + len(m.content) - event = rcv.fetch() + event = rcv.fetch(timeout=1) schema = event.content[0]["_schema_id"] assert schema["_class_name"] == "queueThresholdExceeded" values = event.content[0]["_values"] Propchange: qpid/branches/asyncstore/tests/src/py/qpid_tests/broker_0_9/queue.py ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:r1368652-1375508 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
