Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.noprefetch.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.noprefetch.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.excludes:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.excludes:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.excludes:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/java-derby.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:1180001-1200000
+/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:1180001-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/java-derby.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:1180001-1200000
+/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:1180001-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/java-derby.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/java-derby.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/java.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/java.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/java.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -3,4 +3,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/log4j-test.xml:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/log4j-test.xml:805429-821809
 /qpid/branches/qpid-2935/qpid/java/test-profiles/log4j-test.xml:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Modified: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/python_tests/Java010PythonExcludes
URL: 
http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/python_tests/Java010PythonExcludes?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/python_tests/Java010PythonExcludes
 (original)
+++ 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/python_tests/Java010PythonExcludes
 Thu Mar  1 12:51:40 2012
@@ -66,19 +66,8 @@ qpid.tests.messaging.endpoints.SessionTe
 qpid_tests.broker_0_10.message.MessageTests.test_credit_flow_bytes
 qpid_tests.broker_0_10.message.MessageTests.test_window_flow_bytes
 
-#QPID-3592 Fails to receive more messages after restart
-qpid_tests.broker_0_10.message.MessageTests.test_window_stop
-
-#QPID-3539 Tests fail because is incorrectly being done per session and not 
connection
-qpid_tests.broker_0_10.message.MessageTests.test_no_local
+#QPID-3605 Durable subscriber with no-local true receives messages on 
re-connection
 qpid_tests.broker_0_10.message.MessageTests.test_no_local_awkward
-qpid_tests.broker_0_10.message.MessageTests.test_no_local_exclusive_subscribe
-
-#QPID-3593 Priority Queue test failures
-qpid_tests.broker_0_10.priority.PriorityTests.test_browsing
-qpid_tests.broker_0_10.priority.PriorityTests.test_prioritised_delivery_1
-qpid_tests.broker_0_10.priority.PriorityTests.test_prioritised_delivery_2
-qpid_tests.broker_0_10.priority.PriorityTests.test_requeue
 
 #QPID-3594 exclusive queues problem
 qpid_tests.broker_0_10.queue.QueueTests.test_declare_exclusive

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test-provider.properties:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test-provider.properties:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/test-provider.properties:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/test_resources:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources:805429-821809
 /qpid/branches/qpid-2935/qpid/java/test-profiles/test_resources:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/test_resources:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/test_resources:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Modified: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
URL: 
http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
Files 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
 (original) and 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
 Thu Mar  1 12:51:40 2012 differ

Propchange: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 12:51:40 2012
@@ -2,4 +2,4 @@
 
/qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile:795950-829653
 
/qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile:805429-821809
 
/qpid/branches/qpid-2935/qpid/java/test-profiles/default.testprofile:1061302-1072333
-/qpid/trunk/qpid/java/test-profiles/testprofile.defaults:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/test-profiles/testprofile.defaults:1145001-1157765,1160415-1162726,1162729-1166086,1166089-1225000

Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/etc/perf-report.gnu
URL: 
http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/etc/perf-report.gnu?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/etc/perf-report.gnu 
(original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/etc/perf-report.gnu Thu 
Mar  1 12:51:40 2012
@@ -1,3 +1,22 @@
+#
+# 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.
+#
+
 set terminal png
 set datafile separator ","
 

Modified: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java
 (original)
+++ 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java
 Thu Mar  1 12:51:40 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.
+ *
+ */
 package org.apache.qpid.tools;
 
 /**

Modified: 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfTestController.java
URL: 
http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfTestController.java?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfTestController.java
 (original)
+++ 
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfTestController.java
 Thu Mar  1 12:51:40 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.
+ *
+ */
 package org.apache.qpid.tools;
 
 import java.io.FileWriter;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:[email protected]

Reply via email to