Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/default.testprofile ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 6 16:05:46 2010 @@ -1,3 +1,5 @@ /incubator/qpid/trunk/qpid/java/test-profiles/default.testprofile:443187-726139 /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/trunk/java/test-profiles/default.testprofile:1022063-1037674 +/qpid/trunk/qpid/java/test-profiles/default.testprofile:1022062-1042608
Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.0.10.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.0.10.testprofile?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== --- qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.0.10.testprofile (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.0.10.testprofile Mon Dec 6 16:05:46 2010 @@ -1,3 +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. +# broker.language=java broker.version=0-10 broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.testprofile?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== --- qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.testprofile (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.testprofile Mon Dec 6 16:05:46 2010 @@ -1,3 +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. +# broker.language=java broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java-derby.testprofile ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 6 16:05:46 2010 @@ -1,3 +1,5 @@ /incubator/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:443187-726139 /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/trunk/java/test-profiles/java-derby.testprofile:1022063-1037674 +/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:1022062-1042608 Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.0.10.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.0.10.testprofile?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== --- qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.0.10.testprofile (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.0.10.testprofile Mon Dec 6 16:05:46 2010 @@ -1,3 +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. +# broker.language=java broker.version=0-10 broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.testprofile?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== --- qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.testprofile (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.testprofile Mon Dec 6 16:05:46 2010 @@ -1,3 +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. +# broker.language=java broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/java.testprofile ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 6 16:05:46 2010 @@ -1,3 +1,5 @@ /incubator/qpid/trunk/qpid/java/test-profiles/java.testprofile:443187-726139 /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/trunk/java/test-profiles/java.testprofile:1022063-1037674 +/qpid/trunk/qpid/java/test-profiles/java.testprofile:1022062-1042608 Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/log4j-test.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 6 16:05:46 2010 @@ -2,3 +2,5 @@ /qpid/branches/0.5.x-dev/qpid/java/test-profiles/log4j-test.xml:931179 /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/trunk/java/test-profiles/log4j-test.xml:1022063-1037674 +/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1022062-1042608 Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test-provider.properties ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 6 16:05:46 2010 @@ -1,3 +1,5 @@ /incubator/qpid/trunk/qpid/java/test-profiles/test-provider.properties:443187-726139 /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/trunk/java/test-profiles/test-provider.properties:1022063-1037674 +/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1022062-1042608 Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 6 16:05:46 2010 @@ -1,3 +1,5 @@ /incubator/qpid/trunk/qpid/java/test-profiles/test_resources:443187-726139 /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/trunk/java/test-profiles/test_resources:1022063-1037674 +/qpid/trunk/qpid/java/test-profiles/test_resources:1022062-1042608 Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.crt URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.crt?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== --- qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.crt (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.crt Mon Dec 6 16:05:46 2010 @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICGjCCAYOgAwIBAgIFAJFV5bcwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC +MIICPjCCAaegAwIBAgIFAJJRUVUwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15 -Um9vdENBMB4XDTEwMDcwNjAyNTQ1OFoXDTEwMTAwNjAyNTQ1OFowYTELMAkGA1UE -BhMCY2ExCzAJBgNVBAgTAm9uMRAwDgYDVQQHEwd0b3JvbnRvMQ0wCwYDVQQKEwRh +Um9vdENBMB4XDTEwMTAxNDAyMzM1NloXDTE1MTAxNDAyMzM1NlowYTELMAkGA1UE +BhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMQ0wCwYDVQQKEwRh Y21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMMDWFwcDFAYWNtZS5vcmcwgZ8wDQYJ -KoZIhvcNAQEBBQADgY0AMIGJAoGBAKHJI2XPwISkvic93ICjk9JdYkGeYR4hNK1N -JYCgzfNAJDq5xxYPkJWd9kc8+nlT0f//nPUVVPtYzGgw/WV0J01Wp8pOJZRdOzYk -LjOdaJE8vCoL+EMeYVSEgx2XebEV2l7d7z3gGVFKAmQfEhveNxBWNyJ/o9ELapEF -y1bsPqhjAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAfhj5E7KYqBLOfbOP1DjM1RQ1 -unG/yEbpN+hk0QNN7FHObSHvRfzSfVrZRxFKvZR8o4yN2RL39jkWsq92GGFSlQzF -pqGA7YjR1j4UGkY3xib3Vr1PsDZWqmH3CjxXTdo0Y28LtQ/QMt58c0wcwFwMCONJ -ynb4emD3n6Pw7GjyTYg= +KoZIhvcNAQEBBQADgY0AMIGJAoGBAIlYzFnmAsv/Ci4rgp3sWwkFGFYEBwiXx0Xz +auZ10nrOUz6Ce2FGVQBYFA09zi79iUyn86oLuTY0Kc/1emCZEPkmOW+hw1uk/TxG +5MqpEOZdsDv4xIqBHgtWv/d3kGubwSS5lia1l6EPvnzHvsQSM//xhkrJaF0fAHx5 +FMkilnvfAgMBAAGjIjAgMAkGA1UdEwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIw +DQYJKoZIhvcNAQEFBQADgYEAJ47Q/4/hJMwTTpfcojv9KbZUTrve/wkabUrytNf3 +ogqhaIzgUr+vA9EMBc91Jg1WJC/0VMmTrTEggqrgd/prg4xcyATQOwNR1TiaWC4E +r3pWEpZZnEJSd4vtcciNFNsbuAt2m4Nc90gPNXKgNoe0+3nuxPLs/TIauwOSDF+I +oiw= -----END CERTIFICATE----- Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.req URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.req?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== --- qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.req (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app1.req Mon Dec 6 16:05:46 2010 @@ -1,10 +1,10 @@ -----BEGIN NEW CERTIFICATE REQUEST----- -MIIBoTCCAQoCAQAwYTELMAkGA1UEBhMCY2ExCzAJBgNVBAgTAm9uMRAwDgYDVQQHEwd0b3JvbnRv +MIIBoTCCAQoCAQAwYTELMAkGA1UEBhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRv MQ0wCwYDVQQKEwRhY21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMMDWFwcDFAYWNtZS5vcmcwgZ8w -DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKHJI2XPwISkvic93ICjk9JdYkGeYR4hNK1NJYCgzfNA -JDq5xxYPkJWd9kc8+nlT0f//nPUVVPtYzGgw/WV0J01Wp8pOJZRdOzYkLjOdaJE8vCoL+EMeYVSE -gx2XebEV2l7d7z3gGVFKAmQfEhveNxBWNyJ/o9ELapEFy1bsPqhjAgMBAAGgADANBgkqhkiG9w0B -AQQFAAOBgQAgmtr+de8dmT1zYKOOlMZNh9w9FJ/qsrk0Fj6yC8f1QKv2ZE8de5p62U7PKzbLzDML -kmiU9qSHzuucH3Za9zprQ/5t9zIffO2kr+OgPIzgwdNPjVfH5SQrZlZHyVI9lC/0Ou9uJPScj3Qm -B+lQOmY/tP854g+gqX7drBsP4pQHug== +DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIlYzFnmAsv/Ci4rgp3sWwkFGFYEBwiXx0XzauZ10nrO +Uz6Ce2FGVQBYFA09zi79iUyn86oLuTY0Kc/1emCZEPkmOW+hw1uk/TxG5MqpEOZdsDv4xIqBHgtW +v/d3kGubwSS5lia1l6EPvnzHvsQSM//xhkrJaF0fAHx5FMkilnvfAgMBAAGgADANBgkqhkiG9w0B +AQQFAAOBgQADKx89mTCGIbrCE6lICLYDexGxexeaZaUDq7YgtyXVIs2wcVGcZJGolUARopMWgE+y +ryHTC4nvNCaBULyXGrzwPfzTJaVBiY4V5BoTrmz6Ofd73ZO6ZYNhy9bVLrb5VtDyldCj0EWz2lBe ++OzVUeII5KPopRtzXpMH3sB2OredUg== -----END NEW CERTIFICATE REQUEST----- Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.crt URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.crt?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== --- qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.crt (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.crt Mon Dec 6 16:05:46 2010 @@ -1,14 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICGjCCAYOgAwIBAgIFAJFV5aIwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC +MIICPjCCAaegAwIBAgIFAJJRUXgwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMC Q0ExEDAOBgNVBAgTB09udGFyaW8xDTALBgNVBAoTBEFDTUUxETAPBgNVBAMTCE15 -Um9vdENBMB4XDTEwMDcwNjAyNTQ0N1oXDTEwMTAwNjAyNTQ0N1owYTELMAkGA1UE -BhMCY2ExCzAJBgNVBAgTAm9uMRAwDgYDVQQHEwd0b3JvbnRvMQ0wCwYDVQQKEwRh +Um9vdENBMB4XDTEwMTAxNDAyMzQxNVoXDTE1MTAxNDAyMzQxNVowYTELMAkGA1UE +BhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRvMQ0wCwYDVQQKEwRh Y21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMMDWFwcDJAYWNtZS5vcmcwgZ8wDQYJ -KoZIhvcNAQEBBQADgY0AMIGJAoGBAMqo9Z/4mDtK9/NpIMNa7h91aUIYNClV36V7 -iHFzxGnw6ubWb6FB6uEO2KFnjk+Jd0sUEbZI3OCjltbfqGBv8UDZ+3+vMF4HrGJ9 -+5YilFbhvZ8FGWCFjjh9gV0W0ptfsskcw0KCxmeHGHP8RbHoKS4Y79D2bkW1ovO6 -FzFx3uRfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAXn3f8znVyItIDcC/4zjLczP8 -EbKEpRW656HccDTGygsfK+epyA8CO8RAtddW7epd1z0FCWakd2078pBe225w8/gA -PQDLlfi1vgAxwhh7xZz1UvtkT9scU/GTdmgg5lZYDBeCDVJ3kuY3t5yg47L3Xuwe -WutGKNQMrJlUfFUNG70= +KoZIhvcNAQEBBQADgY0AMIGJAoGBAJcIo3TSYxDa1OfmnDEP4qzLxmgyXC3n0Evu +2nJz0s5zljjItnwJ9UpOkYh/PQcpUWoM+qKeZYadXbGhp8M8nMrJtUPOAKgDmF6A +DKS9WL7u8kVCcEvBzLRD7bftEm2IPaRu72wOQai76hj11rYWHHkdAPem+C4ODqVn +y2NN3zDnAgMBAAGjIjAgMAkGA1UdEwQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIw +DQYJKoZIhvcNAQEFBQADgYEAc5FG8sDbK+i1703rJEwjJ9dCVXljN2jYL1sGXO2o +9O5Da0zKcQ+OMhLJUoJf38pJw+maYhtT0fKFLItXP/rlyWlaGRBjkcZjOZ2D/Hg5 +/8pEVwiyTYRoEnGKRawnedIbEyBAcgtnlbkTFWXtQmnmgVApSzTpALRn5/jUC1PU +Y3g= -----END CERTIFICATE----- Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.req URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.req?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== --- qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.req (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/app2.req Mon Dec 6 16:05:46 2010 @@ -1,10 +1,10 @@ -----BEGIN NEW CERTIFICATE REQUEST----- -MIIBoTCCAQoCAQAwYTELMAkGA1UEBhMCY2ExCzAJBgNVBAgTAm9uMRAwDgYDVQQHEwd0b3JvbnRv +MIIBoTCCAQoCAQAwYTELMAkGA1UEBhMCQ0ExCzAJBgNVBAgTAk9OMRAwDgYDVQQHEwdUb3JvbnRv MQ0wCwYDVQQKEwRhY21lMQwwCgYDVQQLEwNhcnQxFjAUBgNVBAMMDWFwcDJAYWNtZS5vcmcwgZ8w -DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMqo9Z/4mDtK9/NpIMNa7h91aUIYNClV36V7iHFzxGnw -6ubWb6FB6uEO2KFnjk+Jd0sUEbZI3OCjltbfqGBv8UDZ+3+vMF4HrGJ9+5YilFbhvZ8FGWCFjjh9 -gV0W0ptfsskcw0KCxmeHGHP8RbHoKS4Y79D2bkW1ovO6FzFx3uRfAgMBAAGgADANBgkqhkiG9w0B -AQQFAAOBgQC3rWDpHak7fbBf+FvdaqxEoIw+g43RsaDqdGX9ZJJ9ybDi50Xy/YzLiP5vRl3XU8mI -EoqN8ioZl83UXh95Lb6eW/S+ELgiwQh8npblRGpd/IobdKjEAKV1+i3reYqpsYI5L/8JNbcyIT4A -QOTc9itCc7O+klJzkmLqqpmlHhYX5A== +DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJcIo3TSYxDa1OfmnDEP4qzLxmgyXC3n0Evu2nJz0s5z +ljjItnwJ9UpOkYh/PQcpUWoM+qKeZYadXbGhp8M8nMrJtUPOAKgDmF6ADKS9WL7u8kVCcEvBzLRD +7bftEm2IPaRu72wOQai76hj11rYWHHkdAPem+C4ODqVny2NN3zDnAgMBAAGgADANBgkqhkiG9w0B +AQQFAAOBgQAGNtSvXwdyujmMTaVQj2M2jZkgnVFtMBjDDmdz+wgzu8fKaej7e+fJi5owf31wJUUP +0Zi/6mBNj+blmqHjNQ9U3w9Rns0z3+1DbO3Yj48d75IuxQJJd+lXXjCFi2qSBhaNUwyOpzaI1AQo +JJTC1/WMaPENU9bgYYsOrmIhnbt5rQ== -----END NEW CERTIFICATE REQUEST----- Modified: qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/keystore.jks URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/test-profiles/test_resources/ssl/keystore.jks?rev=1042697&r1=1042696&r2=1042697&view=diff ============================================================================== Binary files - no diff available. Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/testkit/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Dec 6 16:05:46 2010 @@ -0,0 +1,7 @@ +/qpid/branches/0.5.x-dev/qpid/java/testkit:886720-886722,887145,892761,894875,916304,916325,930288,931179 +/qpid/branches/0.5.x-dev/testkit:886720-886722 +/qpid/branches/java-broker-0-10/qpid/java/testkit:795950-829653 +/qpid/branches/java-network-refactor/qpid/java/testkit:805429-821809 +/qpid/trunk/java/testkit:1022063-1037674 +/qpid/trunk/qpid/java/testkit:1022062-1042615 +/qpid/trunk/qpid/testkit:796646-796653 Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/Receiver.java ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/testkit/src/main/java/org/apache/qpid/testkit/TestLauncher.java ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/testkit/testkit.py ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/tools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Mon Dec 6 16:05:46 2010 @@ -0,0 +1,7 @@ +/qpid/branches/0.5.x-dev/qpid/java/tools:886720-886722,887145,892761,894875,916304,916325,930288,931179 +/qpid/branches/0.5.x-dev/tools:886720-886722 +/qpid/branches/java-broker-0-10/qpid/java/tools:795950-829653 +/qpid/branches/java-network-refactor/qpid/java/tools:805429-821809 +/qpid/trunk/java/tools:1022063-1037674 +/qpid/trunk/qpid/java/tools:1022062-1042616 +/qpid/trunk/qpid/tools:796646-796653 Propchange: qpid/branches/grkvlt-network-20101013/qpid/java/tools/etc/test.log4j ('svn:mergeinfo' removed) Copied: qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java (from r1042616, qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java) URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java?p2=qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java&p1=qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java&r1=1042616&r2=1042697&rev=1042697&view=diff ============================================================================== --- qpid/trunk/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java (original) +++ qpid/branches/grkvlt-network-20101013/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java Mon Dec 6 16:05:46 2010 @@ -241,7 +241,7 @@ public class TestLauncher implements Err Thread t = null; try { - t = Threading.getThreadFactory().createThread(r); + t = Threading.getThreadFactory().newThread(r); } catch(Exception e) { @@ -274,7 +274,7 @@ public class TestLauncher implements Err Thread t = null; try { - t = Threading.getThreadFactory().createThread(r); + t = Threading.getThreadFactory().newThread(r); } catch(Exception e) { --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:[email protected]
