Author: gtrasuk
Date: Thu Aug 8 04:37:07 2013
New Revision: 1511582
URL: http://svn.apache.org/r1511582
Log:
Apply fix for RIVER-423 to 2.2 branch.
Added:
river/jtsk/branches/2.2/src/net/jini/lookup/entry/Host.java
- copied unchanged from r1511579,
river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/entry/Host.java
river/jtsk/branches/2.2/src/net/jini/lookup/entry/jmx/
- copied from r1511579,
river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/entry/jmx/
river/jtsk/branches/2.2/src/net/jini/lookup/entry/jmx/JMXProperty.java
- copied unchanged from r1511579,
river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/entry/jmx/JMXProperty.java
river/jtsk/branches/2.2/src/net/jini/lookup/entry/jmx/JMXProtocolType.java
- copied unchanged from r1511579,
river/jtsk/skunk/qa_refactor/trunk/src/net/jini/lookup/entry/jmx/JMXProtocolType.java
Modified:
river/jtsk/branches/2.2/ (props changed)
river/jtsk/branches/2.2/asm/asm-3.2.jar (props changed)
river/jtsk/branches/2.2/asm/asm-commons-3.2.jar (props changed)
river/jtsk/branches/2.2/qa/ (props changed)
river/jtsk/branches/2.2/qa/README.txt (props changed)
river/jtsk/branches/2.2/qa/doc/HowToRunATest.html (props changed)
river/jtsk/branches/2.2/qa/doc/HowToWriteATest.html (props changed)
river/jtsk/branches/2.2/qa/doc/discoverygroupmanagement-req.doc (props
changed)
river/jtsk/branches/2.2/qa/doc/discoverygroupmanagement-req.html (props
changed)
river/jtsk/branches/2.2/qa/doc/discoverylocatormanagement-req.doc (props
changed)
river/jtsk/branches/2.2/qa/doc/discoverylocatormanagement-req.html (props
changed)
river/jtsk/branches/2.2/qa/doc/discoverymanagement-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/discoverymanagement-req.html (props
changed)
river/jtsk/branches/2.2/qa/doc/discoverymanagement-test.doc (props
changed)
river/jtsk/branches/2.2/qa/doc/discoverymanagement-test.html (props
changed)
river/jtsk/branches/2.2/qa/doc/discoveryservice-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/discoveryservice-req.html (props changed)
river/jtsk/branches/2.2/qa/doc/discoveryservice-test.doc (props changed)
river/jtsk/branches/2.2/qa/doc/discoveryservice-test.html (props changed)
river/jtsk/branches/2.2/qa/doc/eventmailbox-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/eventmailbox-req.html (props changed)
river/jtsk/branches/2.2/qa/doc/eventmailbox-test.doc (props changed)
river/jtsk/branches/2.2/qa/doc/eventmailbox-test.html (props changed)
river/jtsk/branches/2.2/qa/doc/index-requirements.html (props changed)
river/jtsk/branches/2.2/qa/doc/index-testdescriptions.html (props changed)
river/jtsk/branches/2.2/qa/doc/index.html (props changed)
river/jtsk/branches/2.2/qa/doc/javaspace_req.html (props changed)
river/jtsk/branches/2.2/qa/doc/javaspace_test.html (props changed)
river/jtsk/branches/2.2/qa/doc/joinmanager-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/joinmanager-req.html (props changed)
river/jtsk/branches/2.2/qa/doc/joinmanager-test.doc (props changed)
river/jtsk/branches/2.2/qa/doc/locatordiscovery-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/locatordiscovery-req.html (props changed)
river/jtsk/branches/2.2/qa/doc/locatordiscovery-test.doc (props changed)
river/jtsk/branches/2.2/qa/doc/lookupdiscovery-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/lookupdiscovery-req.html (props changed)
river/jtsk/branches/2.2/qa/doc/lookupdiscovery-test.doc (props changed)
river/jtsk/branches/2.2/qa/doc/qaMethodWorkArch.html (props changed)
river/jtsk/branches/2.2/qa/doc/qaarch.sdw (props changed)
river/jtsk/branches/2.2/qa/doc/renewalmanager-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/renewalmanager-req.html (props changed)
river/jtsk/branches/2.2/qa/doc/renewalservice-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/renewalservice-req.html (props changed)
river/jtsk/branches/2.2/qa/doc/renewalservice-test.doc (props changed)
river/jtsk/branches/2.2/qa/doc/renewalservice-test.html (props changed)
river/jtsk/branches/2.2/qa/doc/servicediscovery-req.doc (props changed)
river/jtsk/branches/2.2/qa/doc/servicediscovery-req.html (props changed)
river/jtsk/branches/2.2/qa/doc/servicediscovery-test.doc (props changed)
river/jtsk/branches/2.2/qa/doc/servicediscovery-test.html (props changed)
river/jtsk/branches/2.2/qa/doc/testcategories.doc (props changed)
river/jtsk/branches/2.2/qa/doc/testcategories.html (props changed)
Propchange: river/jtsk/branches/2.2/
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2:r1511579
Merged /river/jtsk/skunk/qa_refactor/trunk:r1511579
Propchange: river/jtsk/branches/2.2/asm/asm-3.2.jar
------------------------------------------------------------------------------
Merged /river/jtsk/skunk/qa_refactor/trunk/asm/asm-3.2.jar:r1511579
Merged /river/jtsk/branches/2.2/asm/asm-3.2.jar:r1511579
Propchange: river/jtsk/branches/2.2/asm/asm-commons-3.2.jar
------------------------------------------------------------------------------
Merged /river/jtsk/skunk/qa_refactor/trunk/asm/asm-commons-3.2.jar:r1511579
Merged /river/jtsk/branches/2.2/asm/asm-commons-3.2.jar:r1511579
Propchange: river/jtsk/branches/2.2/qa/
------------------------------------------------------------------------------
Merged /river/jtsk/skunk/qa_refactor/trunk/qa:r1511579
Merged /river/jtsk/branches/2.2/qa:r1511579
Propchange: river/jtsk/branches/2.2/qa/README.txt
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/README.txt:r1511579
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/README.txt:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/HowToRunATest.html
------------------------------------------------------------------------------
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/doc/HowToRunATest.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/HowToRunATest.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/HowToWriteATest.html
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/HowToWriteATest.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/HowToWriteATest.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoverygroupmanagement-req.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/branches/2.2/qa/doc/discoverygroupmanagement-req.doc:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoverygroupmanagement-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoverygroupmanagement-req.html
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoverygroupmanagement-req.html:r1511579
Merged
/river/jtsk/branches/2.2/qa/doc/discoverygroupmanagement-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoverylocatormanagement-req.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoverylocatormanagement-req.doc:r1511579
Merged
/river/jtsk/branches/2.2/qa/doc/discoverylocatormanagement-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoverylocatormanagement-req.html
------------------------------------------------------------------------------
Merged
/river/jtsk/branches/2.2/qa/doc/discoverylocatormanagement-req.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoverylocatormanagement-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoverymanagement-req.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoverymanagement-req.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/discoverymanagement-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoverymanagement-req.html
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoverymanagement-req.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/discoverymanagement-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoverymanagement-test.doc
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/discoverymanagement-test.doc:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoverymanagement-test.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoverymanagement-test.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/discoverymanagement-test.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoverymanagement-test.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoveryservice-req.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoveryservice-req.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/discoveryservice-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoveryservice-req.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/discoveryservice-req.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoveryservice-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoveryservice-test.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoveryservice-test.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/discoveryservice-test.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/discoveryservice-test.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/discoveryservice-test.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/discoveryservice-test.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/eventmailbox-req.doc
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/eventmailbox-req.doc:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/eventmailbox-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/eventmailbox-req.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/eventmailbox-req.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/eventmailbox-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/eventmailbox-test.doc
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/eventmailbox-test.doc:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/eventmailbox-test.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/eventmailbox-test.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/eventmailbox-test.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/eventmailbox-test.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/index-requirements.html
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/index-requirements.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/index-requirements.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/index-testdescriptions.html
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/index-testdescriptions.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/index-testdescriptions.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/index.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/index.html:r1511579
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/doc/index.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/javaspace_req.html
------------------------------------------------------------------------------
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/doc/javaspace_req.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/javaspace_req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/javaspace_test.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/javaspace_test.html:r1511579
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/doc/javaspace_test.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/joinmanager-req.doc
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/joinmanager-req.doc:r1511579
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/doc/joinmanager-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/joinmanager-req.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/joinmanager-req.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/joinmanager-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/joinmanager-test.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/joinmanager-test.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/joinmanager-test.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/locatordiscovery-req.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/locatordiscovery-req.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/locatordiscovery-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/locatordiscovery-req.html
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/locatordiscovery-req.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/locatordiscovery-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/locatordiscovery-test.doc
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/locatordiscovery-test.doc:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/locatordiscovery-test.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/lookupdiscovery-req.doc
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/lookupdiscovery-req.doc:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/lookupdiscovery-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/lookupdiscovery-req.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/lookupdiscovery-req.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/lookupdiscovery-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/lookupdiscovery-test.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/lookupdiscovery-test.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/lookupdiscovery-test.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/qaMethodWorkArch.html
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/qaMethodWorkArch.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/qaMethodWorkArch.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/qaarch.sdw
------------------------------------------------------------------------------
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/doc/qaarch.sdw:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/qaarch.sdw:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/renewalmanager-req.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/renewalmanager-req.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/renewalmanager-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/renewalmanager-req.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/renewalmanager-req.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/renewalmanager-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/renewalservice-req.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/renewalservice-req.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/renewalservice-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/renewalservice-req.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/renewalservice-req.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/renewalservice-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/renewalservice-test.doc
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/renewalservice-test.doc:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/renewalservice-test.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/renewalservice-test.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/renewalservice-test.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/renewalservice-test.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/servicediscovery-req.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/servicediscovery-req.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/servicediscovery-req.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/servicediscovery-req.html
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/servicediscovery-req.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/servicediscovery-req.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/servicediscovery-test.doc
------------------------------------------------------------------------------
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/servicediscovery-test.doc:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/servicediscovery-test.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/servicediscovery-test.html
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/servicediscovery-test.html:r1511579
Merged
/river/jtsk/skunk/qa_refactor/trunk/qa/doc/servicediscovery-test.html:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/testcategories.doc
------------------------------------------------------------------------------
Merged /river/jtsk/branches/2.2/qa/doc/testcategories.doc:r1511579
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/doc/testcategories.doc:r1511579
Propchange: river/jtsk/branches/2.2/qa/doc/testcategories.html
------------------------------------------------------------------------------
Merged /river/jtsk/skunk/qa_refactor/trunk/qa/doc/testcategories.html:r1511579
Merged /river/jtsk/branches/2.2/qa/doc/testcategories.html:r1511579
