You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by th...@apache.org on 2011/06/20 15:09:24 UTC
svn commit: r1137621 [1/2] - in /river/jtsk/tags/2.2.0: ./ asm/ qa/ qa/doc/
src-doc/static/ src-doc/static/release-notes/ src/com/sun/jini/config/
src/com/sun/jini/jeri/internal/mux/ src/com/sun/jini/jeri/internal/runtime/
src/manifest/jsk-resources/ME...
Author: thobbs
Date: Mon Jun 20 13:09:22 2011
New Revision: 1137621
URL: http://svn.apache.org/viewvc?rev=1137621&view=rev
Log:
Merged changes from trunk into release tag
Added:
river/jtsk/tags/2.2.0/roll_release.sh
- copied unchanged from r1137616, river/jtsk/trunk/roll_release.sh
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/Binding.java
- copied unchanged from r1137616, river/jtsk/trunk/src/com/sun/jini/jeri/internal/runtime/Binding.java
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/DgcRequestDispatcher.java
- copied unchanged from r1137616, river/jtsk/trunk/src/com/sun/jini/jeri/internal/runtime/DgcRequestDispatcher.java
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/JvmLifeSupport.java
- copied unchanged from r1137616, river/jtsk/trunk/src/com/sun/jini/jeri/internal/runtime/JvmLifeSupport.java
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/Lease.java
- copied unchanged from r1137616, river/jtsk/trunk/src/com/sun/jini/jeri/internal/runtime/Lease.java
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/SequenceEntry.java
- copied unchanged from r1137616, river/jtsk/trunk/src/com/sun/jini/jeri/internal/runtime/SequenceEntry.java
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/Target.java
- copied unchanged from r1137616, river/jtsk/trunk/src/com/sun/jini/jeri/internal/runtime/Target.java
river/jtsk/tags/2.2.0/src/net/jini/config/GroovyConfig.groovy
- copied unchanged from r1137616, river/jtsk/trunk/src/net/jini/config/GroovyConfig.groovy
river/jtsk/tags/2.2.0/test/src/com/sun/jini/discovery/
- copied from r1137616, river/jtsk/trunk/test/src/com/sun/jini/discovery/
river/jtsk/tags/2.2.0/test/src/com/sun/jini/discovery/DiscoveryConstraintsTest.java
- copied unchanged from r1137616, river/jtsk/trunk/test/src/com/sun/jini/discovery/DiscoveryConstraintsTest.java
river/jtsk/tags/2.2.0/test/src/com/sun/jini/discovery/plaintext/
- copied from r1137616, river/jtsk/trunk/test/src/com/sun/jini/discovery/plaintext/
river/jtsk/tags/2.2.0/test/src/com/sun/jini/discovery/plaintext/ClientTest.java
- copied unchanged from r1137616, river/jtsk/trunk/test/src/com/sun/jini/discovery/plaintext/ClientTest.java
river/jtsk/tags/2.2.0/test/src/com/sun/jini/discovery/ssl/
- copied from r1137616, river/jtsk/trunk/test/src/com/sun/jini/discovery/ssl/
river/jtsk/tags/2.2.0/test/src/com/sun/jini/discovery/ssl/ClientTest.java
- copied unchanged from r1137616, river/jtsk/trunk/test/src/com/sun/jini/discovery/ssl/ClientTest.java
river/jtsk/tags/2.2.0/test/src/com/sun/jini/jeri/
- copied from r1137616, river/jtsk/trunk/test/src/com/sun/jini/jeri/
river/jtsk/tags/2.2.0/test/src/com/sun/jini/jeri/internal/
- copied from r1137616, river/jtsk/trunk/test/src/com/sun/jini/jeri/internal/
river/jtsk/tags/2.2.0/test/src/com/sun/jini/jeri/internal/mux/
- copied from r1137616, river/jtsk/trunk/test/src/com/sun/jini/jeri/internal/mux/
river/jtsk/tags/2.2.0/test/src/com/sun/jini/jeri/internal/mux/MuxStartTimeoutTest.java
- copied unchanged from r1137616, river/jtsk/trunk/test/src/com/sun/jini/jeri/internal/mux/MuxStartTimeoutTest.java
Removed:
river/jtsk/tags/2.2.0/DISCLAIMER
river/jtsk/tags/2.2.0/src/com/sun/jini/config/GroovyConfig.groovy
Modified:
river/jtsk/tags/2.2.0/ (props changed)
river/jtsk/tags/2.2.0/asm/asm-3.2.jar (props changed)
river/jtsk/tags/2.2.0/asm/asm-commons-3.2.jar (props changed)
river/jtsk/tags/2.2.0/build.xml
river/jtsk/tags/2.2.0/qa/ (props changed)
river/jtsk/tags/2.2.0/qa/doc/HowToRunATest.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/HowToWriteATest.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoverygroupmanagement-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoverygroupmanagement-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoverylocatormanagement-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoverylocatormanagement-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoverymanagement-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoverymanagement-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoverymanagement-test.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoverymanagement-test.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoveryservice-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoveryservice-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoveryservice-test.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/discoveryservice-test.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/eventmailbox-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/eventmailbox-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/eventmailbox-test.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/eventmailbox-test.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/index-requirements.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/index-testdescriptions.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/index.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/javaspace_req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/javaspace_test.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/joinmanager-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/joinmanager-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/joinmanager-test.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/locatordiscovery-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/locatordiscovery-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/locatordiscovery-test.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/lookupdiscovery-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/lookupdiscovery-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/lookupdiscovery-test.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/qaMethodWorkArch.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/qaarch.sdw (props changed)
river/jtsk/tags/2.2.0/qa/doc/renewalmanager-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/renewalmanager-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/renewalservice-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/renewalservice-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/renewalservice-test.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/renewalservice-test.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/servicediscovery-req.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/servicediscovery-req.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/servicediscovery-test.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/servicediscovery-test.html (props changed)
river/jtsk/tags/2.2.0/qa/doc/testcategories.doc (props changed)
river/jtsk/tags/2.2.0/qa/doc/testcategories.html (props changed)
river/jtsk/tags/2.2.0/src-doc/static/arch2_0.html
river/jtsk/tags/2.2.0/src-doc/static/index.html
river/jtsk/tags/2.2.0/src-doc/static/info-index.html
river/jtsk/tags/2.2.0/src-doc/static/manpages-index.html
river/jtsk/tags/2.2.0/src-doc/static/release-notes/index.html
river/jtsk/tags/2.2.0/src-doc/static/release-notes/jeri.html
river/jtsk/tags/2.2.0/src-doc/static/release-notes/loader.html
river/jtsk/tags/2.2.0/src-doc/static/release-notes/norm.html
river/jtsk/tags/2.2.0/src-doc/static/spec-index.html
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/mux/Mux.java
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/BasicExportTable.java
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/ImplRefManager.java
river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/ObjectTable.java
river/jtsk/tags/2.2.0/src/manifest/jsk-resources/META-INF/services/net.jini.config.Configuration
river/jtsk/tags/2.2.0/src/net/jini/config/package.html
river/jtsk/tags/2.2.0/src/net/jini/jeri/connection/ConnectionManager.java
river/jtsk/tags/2.2.0/src/net/jini/loader/pref/PreferredClassProvider.java
river/jtsk/tags/2.2.0/test/src/com/sun/jini/outrigger/FastListTest.java
Propchange: river/jtsk/tags/2.2.0/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 20 13:09:22 2011
@@ -10,3 +10,5 @@ lib-dl
lib
dist
doc
+LICENSE.txt
+NOTICE.txt
Propchange: river/jtsk/tags/2.2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters:765902-766476
+/river/jtsk/trunk:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/asm/asm-3.2.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/tools/asm-3.2.jar:765902-766476
+/river/jtsk/trunk/asm/asm-3.2.jar:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/asm/asm-commons-3.2.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/tools/asm-commons-3.2.jar:765902-766476
+/river/jtsk/trunk/asm/asm-commons-3.2.jar:1131047-1137616
Modified: river/jtsk/tags/2.2.0/build.xml
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/build.xml?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/build.xml (original)
+++ river/jtsk/tags/2.2.0/build.xml Mon Jun 20 13:09:22 2011
@@ -73,9 +73,8 @@
</target>
<fileset id="river.bin.files" dir="${basedir}">
- <include name="DISCLAIMER"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
+ <include name="LICENSE*"/>
+ <include name="NOTICE*"/>
<include name="${lib}/**"/>
<include name="${lib-dl}/**"/>
@@ -84,9 +83,8 @@
</fileset>
<fileset id="river.doc.files" dir="${basedir}">
- <include name="DISCLAIMER"/>
- <include name="LICENSE"/>
- <include name="NOTICE"/>
+ <include name="LICENSE*"/>
+ <include name="NOTICE*"/>
<include name="${doc}/**"/>
<exclude name="${doc}/release-notes/new.html"/>
@@ -112,10 +110,10 @@
<include name="${lib-ext}/**"/>
<include name="${doc}/**"/>
<include name="harness/**"/>
- <include name="README.txt"/>
+ <include name="README*"/>
</fileset>-->
- <target name="release-bin" description="Create a binary release" depends="all.build">
+ <target name="release-bin" description="Create a binary release" depends="duplicate-text-files, all.build">
<!-- TODO: add depends: javadoc-internals and remove from ci-build -->
<mkdir dir="${dist.dir}"/>
@@ -178,10 +176,15 @@
<include name="${doc}/**"/>
<exclude name="${doc.api}/"/>
<include name="build.xml"/>
- <include name="README*.txt"/>
+ <include name="README*"/>
</fileset>
- <target name="release-doc" description="Create release doc archives" depends="river-doc">
+ <target name="duplicate-text-files" description="Creates friendly txt versions of common files">
+ <copy file="LICENSE" toFile="LICENSE.txt"/>
+ <copy file="NOTICE" toFile="NOTICE.txt"/>
+ </target>
+
+ <target name="release-doc" description="Create release doc archives" depends="duplicate-text-files, river-doc">
<mkdir dir="${dist.dir}"/>
<delete file="${doc.zip.bundle}"/>
@@ -194,7 +197,7 @@
</tar>
</target>
- <target name="release-src" description="Create a source release">
+ <target name="release-src" description="Create a source release" depends="duplicate-text-files">
<mkdir dir="${dist.dir}"/>
<delete file="${src.zip.bundle}"/>
<zip destfile="${src.zip.bundle}" roundup="yes">
@@ -361,6 +364,7 @@
<package name="net.jini.url.https"/>
</javadoc>
<mkdir dir="${doc.api.dir}/doc-files"/>
+ <copy file="NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE.txt"/>
<copy file="NOTICE" tofile="${doc.api.dir}/doc-files/NOTICE"/>
</target>
@@ -389,6 +393,7 @@
<sourcepath refid="javadoc.sourcepath" />
</javadoc>
<mkdir dir="${doc.internals.dir}/doc-files"/>
+ <copy file="NOTICE" tofile="${doc.internals.dir}/doc-files/NOTICE.txt"/>
<copy file="NOTICE" tofile="${doc.internals.dir}/doc-files/NOTICE"/>
</target>
@@ -450,6 +455,7 @@
</javadoc>
<mkdir dir="${doc.spec.api.dir}/doc-files"/>
<copy file="NOTICE" tofile="${doc.spec.api.dir}/doc-files/NOTICE"/>
+ <copy file="NOTICE" tofile="${doc.spec.api.dir}/doc-files/NOTICE.txt"/>
</target>
<!-- =========== ... ============ -->
@@ -2174,6 +2180,13 @@
<property name="harness.generateHtml" value="${harness.generateHtml}" />
</ant>
</target>
+
+ <target name="qa.run-tests" depends="" description="Run Specific QA tests">
+ <!-- Call qa subcomponent build -->
+ <ant dir="qa" target="run-tests" inheritall="false">
+ <property name="harness.generateHtml" value="${harness.generateHtml}" />
+ </ant>
+ </target>
<target name="all.build" depends="river-runtime"
description="Build all, including subcomponents">
Propchange: river/jtsk/tags/2.2.0/qa/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -0,0 +1 @@
+/river/jtsk/trunk/qa:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/HowToRunATest.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/HowToRunATest.html:766115-766476
+/river/jtsk/trunk/qa/doc/HowToRunATest.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/HowToWriteATest.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/HowToWriteATest.html:766115-766476
+/river/jtsk/trunk/qa/doc/HowToWriteATest.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoverygroupmanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverygroupmanagement-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoverygroupmanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverygroupmanagement-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/discoverygroupmanagement-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoverylocatormanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverylocatormanagement-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoverylocatormanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverylocatormanagement-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/discoverylocatormanagement-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoverymanagement-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/discoverymanagement-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoverymanagement-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/discoverymanagement-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoverymanagement-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-test.doc:766115-766476
+/river/jtsk/trunk/qa/doc/discoverymanagement-test.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoverymanagement-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoverymanagement-test.html:766115-766476
+/river/jtsk/trunk/qa/doc/discoverymanagement-test.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoveryservice-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/discoveryservice-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoveryservice-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/discoveryservice-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoveryservice-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-test.doc:766115-766476
+/river/jtsk/trunk/qa/doc/discoveryservice-test.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/discoveryservice-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/discoveryservice-test.html:766115-766476
+/river/jtsk/trunk/qa/doc/discoveryservice-test.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/eventmailbox-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/eventmailbox-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/eventmailbox-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/eventmailbox-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/eventmailbox-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-test.doc:766115-766476
+/river/jtsk/trunk/qa/doc/eventmailbox-test.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/eventmailbox-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/eventmailbox-test.html:766115-766476
+/river/jtsk/trunk/qa/doc/eventmailbox-test.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/index-requirements.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index-requirements.html:766115-766476
+/river/jtsk/trunk/qa/doc/index-requirements.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/index-testdescriptions.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index-testdescriptions.html:766115-766476
+/river/jtsk/trunk/qa/doc/index-testdescriptions.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/index.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/index.html:766115-766476
+/river/jtsk/trunk/qa/doc/index.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/javaspace_req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/javaspace_req.html:766115-766476
+/river/jtsk/trunk/qa/doc/javaspace_req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/javaspace_test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/javaspace_test.html:766115-766476
+/river/jtsk/trunk/qa/doc/javaspace_test.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/joinmanager-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/joinmanager-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/joinmanager-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/joinmanager-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/joinmanager-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/joinmanager-test.doc:766115-766476
+/river/jtsk/trunk/qa/doc/joinmanager-test.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/locatordiscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/locatordiscovery-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/locatordiscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/locatordiscovery-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/locatordiscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/locatordiscovery-test.doc:766115-766476
+/river/jtsk/trunk/qa/doc/locatordiscovery-test.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/lookupdiscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/lookupdiscovery-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/lookupdiscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/lookupdiscovery-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/lookupdiscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/lookupdiscovery-test.doc:766115-766476
+/river/jtsk/trunk/qa/doc/lookupdiscovery-test.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/qaMethodWorkArch.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/qaMethodWorkArch.html:766115-766476
+/river/jtsk/trunk/qa/doc/qaMethodWorkArch.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/qaarch.sdw
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/qaarch.sdw:766115-766476
+/river/jtsk/trunk/qa/doc/qaarch.sdw:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/renewalmanager-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalmanager-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/renewalmanager-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/renewalmanager-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalmanager-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/renewalmanager-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/renewalservice-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/renewalservice-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/renewalservice-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/renewalservice-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/renewalservice-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-test.doc:766115-766476
+/river/jtsk/trunk/qa/doc/renewalservice-test.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/renewalservice-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/renewalservice-test.html:766115-766476
+/river/jtsk/trunk/qa/doc/renewalservice-test.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/servicediscovery-req.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-req.doc:766115-766476
+/river/jtsk/trunk/qa/doc/servicediscovery-req.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/servicediscovery-req.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-req.html:766115-766476
+/river/jtsk/trunk/qa/doc/servicediscovery-req.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/servicediscovery-test.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-test.doc:766115-766476
+/river/jtsk/trunk/qa/doc/servicediscovery-test.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/servicediscovery-test.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/servicediscovery-test.html:766115-766476
+/river/jtsk/trunk/qa/doc/servicediscovery-test.html:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/testcategories.doc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/testcategories.doc:766115-766476
+/river/jtsk/trunk/qa/doc/testcategories.doc:1131047-1137616
Propchange: river/jtsk/tags/2.2.0/qa/doc/testcategories.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 20 13:09:22 2011
@@ -1 +1,2 @@
/incubator/river/jtsk/skunk/jcosters/qa/doc/testcategories.html:766115-766476
+/river/jtsk/trunk/qa/doc/testcategories.html:1131047-1137616
Modified: river/jtsk/tags/2.2.0/src-doc/static/arch2_0.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/arch2_0.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/arch2_0.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/arch2_0.html Mon Jun 20 13:09:22 2011
@@ -19,23 +19,22 @@
<body text="#000000" bgcolor="#ffffff" link="#9b37cc"
vlink="#cc1877" alink="#ffffff">
-<title>Jini Architecture Specification Version 2.0 Overview - Apache River Release v2.1.2</title>
+<title>Jini Specification Overview - Apache River Release v2.2.0</title>
<a name="TOP">
-<center><h1>Jini<font><sup>TM</sup></font> Architecture Specification Version 2.0 Extensions Overview<br>
- Apache River Release v2.1.2</h1></center>
+<center><h1>Jini Specification Overview<br>
+ Apache River Release v2.2.0</h1></center>
<br>
-<p>This document provides an overview of the new components of
-the Jini<font size="-1"><sup>TM</sup></font> v2.0 Architecture included in Apache River and
-explains how the components fit together and fit within the
-existing Jini<font size="-1"><sup>TM</sup></font> technology infrastructure. Much of this
+<p>This document provides an overview of the implementation details of
+Jini Specifications included in Apache River and
+explains how these components fit together. Much of this
information is available in the package, interface, and class
documentation, but this document provides a higher-level overview
and indicates where to find more information.
-<h2>1 Overview of Jini<font size="-1"><sup>TM</sup></font> Architecture</h2>
+<h2>1 Overview of Jini Architecture</h2>
<p>The Jini system architecture consists of three categories:
<i>programming model</i>, <i>infrastructure</i>, and <i>services</i>.
@@ -81,7 +80,7 @@ model. The component additions can be s
<li><a href="api/net/jini/security/ProxyPreparer.html">ProxyPreparer</a>
</ul>
-<p><i>New Infrastructure</i>
+<p><i>Additional Infrastructure</i>
<ul>
<li><a href="api/net/jini/security/package-summary.html">Security</a>
<li><a href="api/net/jini/core/constraint/package-summary.html">Invocation Constraints</a>
@@ -92,15 +91,14 @@ remote invocation (Jini ERI)</a>
<li><a href="api/com/sun/jini/discovery/package-summary.html">Discovery Protocol v2</a>
</ul>
-<p><i>Updates to Services</i>
+<p><i>Configuring Services</i>
-<p>Each service has been updated to support being
+<p>Each service included in Apache River supports being
configured using a <code>Configuration</code>. Most of the
services were previously configured via system properties. These
services can now be configured via entries in the configuration.
New types of behavior that can be configured are remote service
-exporting and proxy preparation.
-
+exporting and proxy preparation.</p>
<h3>1.1 Goals</h3>
Modified: river/jtsk/tags/2.2.0/src-doc/static/index.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/index.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/index.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/index.html Mon Jun 20 13:09:22 2011
@@ -23,7 +23,7 @@
<center><h1>Apache River Release<BR>v2.2.0</h1></center>
<hr>
<p>
-The Apache River release is based on the following two major contributions:
+The Apache River release is built on the following two major original contributions:
the Jini Technology Starter Kit, and Service UI. In the documentation for this
release, you may see historical references to those releases.
@@ -33,8 +33,8 @@ release, you may see historical referenc
<p>
<LI><B>Informative reading</B>
<ul>
- <li><i><a href="arch2_0.html">Jini<font size="-1"><sup>TM</sup></font> Architecture Specification Version 2.0 Extensions</a></i>
- <li><i><a href="specs/html/jini-spec.html">Jini<font size="-1"><sup>TM</sup></font> Architecture Specification Version 1.0</a></i>
+ <li><i><a href="arch2_0.html">Jini Specification Overview</a></i>
+ <li><i><a href="specs/html/jini-spec.html">Jini Architecture Specification Version 1.0</a></i>
</ul>
<p>
@@ -42,7 +42,7 @@ release, you may see historical referenc
<p>
<LI><B><a href="manpages-index.html">Manual Pages</a></B> for services, utilities, and tools
<p>
-<LI><B><a href="spec-index.html">Specifications</a></B>
+<LI><B><a href="spec-index.html">Jini Network Technology Specifications</a></B>
<p>
<LI><B>API documentation</B>
<UL>
Modified: river/jtsk/tags/2.2.0/src-doc/static/info-index.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/info-index.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/info-index.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/info-index.html Mon Jun 20 13:09:22 2011
@@ -20,7 +20,7 @@
<title>Apache River Release Getting Started & More</title>
-<center><h1>Apache River Release<BR>Getting Started & More with v2.1.2</h1></center>
+<center><h1>Apache River Release<BR>Getting Started & More with v2.2.0</h1></center>
<UL><UL>
<LI><a href="#examine">Examining the distribution</a>
<LI><a href="#install">Installing the <code>jsk-policy.jar</code> file</a>
Modified: river/jtsk/tags/2.2.0/src-doc/static/manpages-index.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/manpages-index.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/manpages-index.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/manpages-index.html Mon Jun 20 13:09:22 2011
@@ -22,7 +22,7 @@
<h1><center>Apache River Release
-<br>v2.1.2 Manual Pages</center></h1><br>
+<br>v2.2.0 Manual Pages</center></h1><br>
<hr>
Modified: river/jtsk/tags/2.2.0/src-doc/static/release-notes/index.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/release-notes/index.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/release-notes/index.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/release-notes/index.html Mon Jun 20 13:09:22 2011
@@ -47,11 +47,17 @@ project Mailing Lists</a> page.
<hr>
<h1>Release Notes - River 2.2.0</h1>
<h2>Sub-task</h2>
+
+ Release Notes - River - Version River_2.2.0
+
+<h2> Sub-task
+</h2>
<ul>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-374'>RIVER-374</a>] - Review how LookupLocator is used to provide host and port details for LookupLocatorDiscovery
</li>
</ul>
-<h2>Bug
+
+<h2> Bug
</h2>
<ul>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-11'>RIVER-11</a>] - LookupLocatorDiscovery ignores new LookupLocator instances for which only constraints differ
@@ -60,6 +66,8 @@ project Mailing Lists</a> page.
</li>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-183'>RIVER-183</a>] - clarify meaning of "calls from the local host"
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/RIVER-287'>RIVER-287</a>] - [PATCH] avoid race condition problems for taking snapshots
+</li>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-296'>RIVER-296</a>] - Mahalo implementation throws CannotAbortException from abort() on an expired transaction
</li>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-334'>RIVER-334</a>] - jre 6 Policy issues
@@ -70,6 +78,10 @@ project Mailing Lists</a> page.
</li>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-391'>RIVER-391</a>] - Outrigger failure under stress
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/RIVER-397'>RIVER-397</a>] - Mux.start() can block indefinitely
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/RIVER-142'>RIVER-142</a>] - concurrency problem in DGC lease expiration handling
+</li>
</ul>
<h2> Improvement
@@ -81,6 +93,8 @@ project Mailing Lists</a> page.
</li>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-349'>RIVER-349</a>] - Setup separate Hudson job for QA testing
</li>
+<li>[<a href='https://issues.apache.org/jira/browse/RIVER-396'>RIVER-396</a>] - PreferredClassProvider classloader cache concurrency improvement
+</li>
</ul>
<h2> New Feature
@@ -103,6 +117,7 @@ project Mailing Lists</a> page.
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-333'>RIVER-333</a>] - Tested platforms
</li>
</ul>
+
<a name="changes">
<h2>Changes by Component, updated for v2.2.0</h2></a>
<h3>Services</h3>
@@ -111,6 +126,18 @@ project Mailing Lists</a> page.
<li><a href="mahalo.html">Mahalo</a>
<li><a href="outrigger.html">Outrigger</a>
</ul>
+<h3>Jeri</h3>
+<ul>
+ <li><a href="jeri.html"><code>net.jini.jeri</code></a>
+</ul>
+<h3>Loader</h3>
+<ul>
+ <li><a href="loader.html"><code>net.jini.loader</code></a>
+</ul>
+<h3>Normal</h3>
+<ul>
+ <li><a href="norm.html"><code>com.sun.jini.norm</code></a>
+</ul>
<h3>Other</h3>
<ul>
<li><a href="security.html">Security</a>
Modified: river/jtsk/tags/2.2.0/src-doc/static/release-notes/jeri.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/release-notes/jeri.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/release-notes/jeri.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/release-notes/jeri.html Mon Jun 20 13:09:22 2011
@@ -37,11 +37,10 @@ package and its subpackages provide APIs
invocation (Jini ERI) and several Jini ERI transport layer providers.
<H3>Changes since the v2.2.0 release</H3>
-<dl>
-
-<dt><b>None</b></dt>
-
-</dl>
+<li>[<a href='https://issues.apache.org/jira/browse/RIVER-397'>RIVER-397</a>] - Mux.start() can block indefinitely
+</li>
+<li>[<a href='https://issues.apache.org/jira/browse/RIVER-142'>RIVER-142</a>] - concurrency problem in DGC lease expiration handling
+</li>
<H3>Changes since the v2.1.1 release</H3>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-22'>RIVER-22</a>] -
NPE in net.jini.jeri.tcp.TcpEndpoint$ConnectionImpl.checkConnectPermission
Modified: river/jtsk/tags/2.2.0/src-doc/static/release-notes/loader.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/release-notes/loader.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/release-notes/loader.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/release-notes/loader.html Mon Jun 20 13:09:22 2011
@@ -37,11 +37,7 @@ package and its subpackages provide APIs
loading and, in particular, <i>preferred classes</i>.
<H3>Changes since the v2.2.0 release</H3>
-<dl>
-
-<dt><b>None</b></dt>
-
-</dl>
+<li>[<a href='https://issues.apache.org/jira/browse/RIVER-396'>RIVER-396</a>] - PreferredClassProvider classloader cache concurrency improvement
<H3>Changes since the v2.1.1 release</H3>
<li>[<a href='https://issues.apache.org/jira/browse/RIVER-9'>RIVER-9</a>] -
Modified: river/jtsk/tags/2.2.0/src-doc/static/release-notes/norm.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/release-notes/norm.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/release-notes/norm.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/release-notes/norm.html Mon Jun 20 13:09:22 2011
@@ -43,11 +43,7 @@ href="../api/net/jini/admin/Administrabl
<p>
<H3>Changes since the v2.2.0 release</H3>
-<dl>
-
-<dt><b>None</b></dt>
-
-</dl>
+<li>[<a href='https://issues.apache.org/jira/browse/RIVER-287'>RIVER-287</a>] - [PATCH] avoid race condition problems for taking snapshots
<H3>Changes since the v2.1.1 release</H3>
<dl>
Modified: river/jtsk/tags/2.2.0/src-doc/static/spec-index.html
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src-doc/static/spec-index.html?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src-doc/static/spec-index.html (original)
+++ river/jtsk/tags/2.2.0/src-doc/static/spec-index.html Mon Jun 20 13:09:22 2011
@@ -21,10 +21,10 @@
<body text="#000000" bgcolor="#ffffff" link="#9b37cc"
vlink="#cc1877" alink="#ffffff">
-<h1><center>Jini(TM) Network Technology Specifications<br>Apache River v2.1.2</center></h1>
+<h1><center>Jini(TM) Network Technology Specifications<br>Apache River v2.2.0</center></h1>
<UL>
<p>
-The following specifications are available in HTML in this v2.1.2 release.
+The following specifications are available in HTML in this v2.2.0 release.
</P>
<p>
@@ -34,6 +34,10 @@ Apache River project. Modifications are
to be expected based on learnings from Apache River's continued development.
</P>
<ul>
+ <li><i><a href="specs/html/jini-spec.html">
+ Jini Architecture Specification</i></a>
+ <li><i><a href="specs/html/devicearch-spec.html">
+ Jini Device Architecture Specification</i></a>
<li><i><a href="specs/html/discovery-spec.html">
Jini Discovery and Join Specification</i></a>
<li><i><a href="specs/html/entry-spec.html">
Modified: river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/mux/Mux.java
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/mux/Mux.java?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/mux/Mux.java (original)
+++ river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/mux/Mux.java Mon Jun 20 13:09:22 2011
@@ -137,6 +137,7 @@ abstract class Mux {
final Map sessions = new HashMap(5);
private int expectedPingCookie = -1;
+ private long startTimeout = 15000; // milliseconds
/**
* Constructs a new Mux instance for a connection accessible through
@@ -177,6 +178,24 @@ abstract class Mux {
}
/**
+ * Time in milliseconds for client-side connections to wait for the server
+ * to acknowledge an opening handshake. The default value is 15000
+ * milliseconds (15 seconds).
+ *
+ * <p>
+ * This method is not thread-safe. It is expected to be called immediately
+ * after a constructor.
+ *
+ * @param timeout
+ * positive value in milliseconds
+ */
+ public void setStartTimeout(long timeout) {
+ if (timeout <= 0)
+ throw new IllegalArgumentException("start timeout must be a positive number of milliseconds");
+ this.startTimeout = timeout;
+ }
+
+ /**
* Starts I/O processing.
*
* This method should be invoked only after this instance has
@@ -201,12 +220,19 @@ abstract class Mux {
if (role == CLIENT) {
asyncSendClientConnectionHeader();
synchronized (muxLock) {
+ long now = System.currentTimeMillis();
+ long endTime = now + this.startTimeout;
while (!muxDown && !clientConnectionReady) {
- try {
- muxLock.wait(); // REMIND: timeout?
- } catch (InterruptedException e) {
- setDown("interrupt waiting for connection header", e);
- }
+ if (now >= endTime) {
+ setDown("timeout waiting for server to respond to handshake", null);
+ } else {
+ try {
+ muxLock.wait(endTime - now);
+ now = System.currentTimeMillis();
+ } catch (InterruptedException e) {
+ setDown("interrupt waiting for connection header", e);
+ }
+ }
}
if (muxDown) {
IOException ioe = new IOException(muxDownMessage);
Modified: river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/BasicExportTable.java
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/BasicExportTable.java?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/BasicExportTable.java (original)
+++ river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/BasicExportTable.java Mon Jun 20 13:09:22 2011
@@ -19,15 +19,13 @@
package com.sun.jini.jeri.internal.runtime;
import java.io.IOException;
-import java.io.InterruptedIOException;
import java.rmi.Remote;
import java.rmi.server.ExportException;
-import java.rmi.server.Unreferenced;
-import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.List;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import net.jini.id.Uuid;
import net.jini.jeri.Endpoint;
import net.jini.jeri.InvocationDispatcher;
@@ -35,8 +33,6 @@ import net.jini.jeri.RequestDispatcher;
import net.jini.jeri.ServerEndpoint;
import net.jini.jeri.ServerEndpoint.ListenCookie;
import net.jini.jeri.ServerEndpoint.ListenEndpoint;
-import net.jini.jeri.ServerEndpoint.ListenHandle;
-import net.jini.security.Security;
/**
* An ObjectTable front end for exporting remote objects with a
@@ -49,23 +45,16 @@ import net.jini.security.Security;
**/
public final class BasicExportTable {
- /**
- * listen pool marker value to signal that a listen operation on a
- * ListenEndpoint is currently being started by another thread
- **/
- private static final Object PENDING = new Object();
-
/** underlying object table */
private final ObjectTable objectTable = new ObjectTable();
- /** guards listenPool and all Binding.exportsInProgress fields */
- private final Object lock = new Object();
-
/**
* pool of endpoints that we're listening on:
- * maps SameClassKey(ServerEndpoint.ListenEndpoint) to Binding
+ * maps SameClassKey(ServerEndpoint.ListenEndpoint) to Binding.
+ * A binding removes itself from the listen pool.
**/
- private final Map listenPool = new HashMap();
+ private final ConcurrentMap<SameClassKey,Binding> listenPool =
+ new ConcurrentHashMap<SameClassKey,Binding>(128);// 128 to reduce map resizing
/**
* Creates a new instance.
@@ -84,7 +73,7 @@ public final class BasicExportTable {
throws ExportException
{
List bindings = null;
- ObjectTable.Target target = null;
+ Target target = null;
Endpoint endpoint;
try {
LC listenContext = new LC();
@@ -101,7 +90,7 @@ public final class BasicExportTable {
new RequestDispatcher[bindings.size()];
for (int i = 0; i < requestDispatchers.length; i++) {
requestDispatchers[i] =
- ((Binding) bindings.get(i)).requestDispatcher;
+ ((Binding) bindings.get(i)).getRequestDispatcher();
}
target = objectTable.export(
impl, requestDispatchers, allowDGC, keepAlive, id);
@@ -115,9 +104,7 @@ public final class BasicExportTable {
*/
for (int i = 0; i < bindings.size(); i++) {
Binding binding = (Binding) bindings.get(i);
- synchronized (lock) {
- binding.exportsInProgress--;
- }
+ binding.decrementExportInProgress();
/*
* If export wasn't successful, check to see if
* binding can be released.
@@ -142,10 +129,10 @@ public final class BasicExportTable {
**/
public static final class Entry {
private final List bindings;
- private final ObjectTable.Target target;
+ private final Target target;
private final Endpoint endpoint;
- Entry(List bindings, ObjectTable.Target target, Endpoint endpoint) {
+ Entry(List bindings, Target target, Endpoint endpoint) {
this.bindings = bindings;
this.target = target;
this.endpoint = endpoint;
@@ -189,45 +176,50 @@ public final class BasicExportTable {
private Binding getBinding(ListenEndpoint listenEndpoint)
throws IOException
{
- Object key = new SameClassKey(listenEndpoint);
+ SameClassKey key = new SameClassKey(listenEndpoint);
Binding binding = null;
- synchronized (lock) {
- do {
- Object value = listenPool.get(key);
- if (value instanceof Binding) {
- binding = (Binding) value;
- binding.exportsInProgress++;
- return binding;
- } else if (value == PENDING) {
- try {
- lock.wait();
- } catch (InterruptedException e) {
- throw new InterruptedIOException();
- }
- continue;
- } else {
- assert value == null;
- listenPool.put(key, PENDING);
- break;
- }
- } while (true);
- }
- try {
- // start listen operation without holding global lock
- binding = new Binding(listenEndpoint);
- } finally {
- synchronized (lock) {
- assert listenPool.get(key) == PENDING;
- if (binding != null) {
- listenPool.put(key, binding);
- binding.exportsInProgress++;
- } else {
- listenPool.remove(key);
- }
- lock.notifyAll();
- }
- }
- return binding;
+ // This while loop ensures that a binding has it's exportInProgress
+ // field incremented and the binding was not closed prior.
+ // Once the exportInProgress field is incremented, the binding will stay active.
+ // It is still possible for activation to be unsuccessful, resulting
+ // in an IOException.
+ // The reason for this while loop, is Binding's remove themselves from
+ // the listenPool if inactive, a binding may be removed from the
+ // listenPool by another thread without the current threads knowledge.
+ // This will only happen while the binding has no Exports in progress.
+ // Thus the increment calls are checked to be active;
+ while (binding == null){
+ binding = listenPool.get(key);
+ if ( binding == null){
+ binding = new Binding(listenEndpoint,objectTable, listenPool);
+ Binding existed = listenPool.putIfAbsent(key, binding);
+ if (existed != null){
+ binding = existed;
+ boolean active = binding.incrementExportInProgress();
+ if (!active){
+ binding = null;
+ }
+ continue;
+ } else {
+ boolean active = binding.activate();
+ if (!active){
+ binding = null;
+ }
+ continue;
+ }
+ } else {
+ // Although unlikely the binding could become inactive
+ // after retrieval, since the operation of getting and checking is not atomic.
+ // If inactive, the binding has removed itself from the listenPool.
+ boolean active = binding.incrementExportInProgress();
+ if (!active) {
+ binding = null;
+ // This binding will have removed itself from listenPool.
+ }
+ }
+ }
+ binding.activate(); //Prevent a thread returning normally with an inactive object
+ return binding;
}
/**
@@ -235,12 +227,13 @@ public final class BasicExportTable {
* and gets the corresponding bindings using the listen pool.
**/
private class LC implements ServerEndpoint.ListenContext {
- private boolean done = false;
- private final List bindings = new ArrayList();
+ private volatile boolean done = false;
+ private final List<Binding> bindings =
+ Collections.synchronizedList(new ArrayList<Binding>());
LC() { }
- public synchronized ListenCookie addListenEndpoint(
+ public ListenCookie addListenEndpoint(
ListenEndpoint listenEndpoint)
throws IOException
{
@@ -252,75 +245,13 @@ public final class BasicExportTable {
listenEndpoint.checkPermissions();
Binding binding = getBinding(listenEndpoint);
- bindings.add(binding);
- return binding.listenHandle.getCookie();
+ bindings.add(binding);
+ return binding.getListenHandle().getCookie();
}
- synchronized List getFinalBindings() {
+ private List getFinalBindings() {
done = true;
return bindings;
}
}
-
- /**
- * A bound ListenEndpoint and the associated ListenHandle and
- * RequestDispatcher.
- **/
- private class Binding {
- private final ListenEndpoint listenEndpoint;
- final RequestDispatcher requestDispatcher;
- final ListenHandle listenHandle;
-
- int exportsInProgress = 0; // guarded by outer "lock"
-
- /**
- * Creates a binding for the specified ListenEndpoint by
- * attempting to listen on it.
- **/
- Binding(final ListenEndpoint listenEndpoint) throws IOException {
- this.listenEndpoint = listenEndpoint;
- requestDispatcher =
- objectTable.createRequestDispatcher(new Unreferenced() {
- public void unreferenced() { checkReferenced(); }
- });
- try {
- /*
- * We don't want this (potentially) shared listen
- * operation to inherit the access control context of
- * the current callers arbitrarily (their permissions
- * were already checked by the ListenContext, and the
- * ObjectTable will take care of checking permissions
- * per requests against the appropriate callers'
- * access control context).
- */
- listenHandle = (ListenHandle)
- Security.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws IOException {
- return listenEndpoint.listen(requestDispatcher);
- }
- });
- } catch (java.security.PrivilegedActionException e) {
- throw (IOException) e.getException();
- }
- }
-
- /**
- * Checks whether there are any objects currently exported to
- * this binding's RequestDispatcher or if there are any
- * exports in progress for this binding; if there are neither,
- * this binding is removed from the listen pool and its listen
- * operation is closed.
- **/
- void checkReferenced() {
- synchronized (lock) {
- if (exportsInProgress > 0 ||
- objectTable.isReferenced(requestDispatcher))
- {
- return;
- }
- listenPool.remove(new SameClassKey(listenEndpoint));
- }
- listenHandle.close();
- }
- }
}
Modified: river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/ImplRefManager.java
URL: http://svn.apache.org/viewvc/river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/ImplRefManager.java?rev=1137621&r1=1137620&r2=1137621&view=diff
==============================================================================
--- river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/ImplRefManager.java (original)
+++ river/jtsk/tags/2.2.0/src/com/sun/jini/jeri/internal/runtime/ImplRefManager.java Mon Jun 20 13:09:22 2011
@@ -18,7 +18,7 @@
package com.sun.jini.jeri.internal.runtime;
-import com.sun.jini.jeri.internal.runtime.ObjectTable.Target;
+import com.sun.jini.jeri.internal.runtime.Target;
import com.sun.jini.thread.NewThreadAction;
import java.lang.ref.Reference;
import java.lang.ref.ReferenceQueue;
@@ -69,7 +69,7 @@ final class ImplRefManager {
private final Object lock = new Object();
/** maps WeakKey(impl) to ImplRef(WeakKey(impl)) */
- private final Map weakImplTable = new HashMap();
+ private final Map<Reference,ImplRef> weakImplTable = new HashMap<Reference,ImplRef>();
/** thread to process garbage collected impls */
private Thread reaper = null;
@@ -99,7 +99,7 @@ final class ImplRefManager {
*/
Reference lookupKey = new WeakKey(impl, reapQueue);
synchronized (lock) {
- ImplRef implRef = (ImplRef) weakImplTable.get(lookupKey);
+ ImplRef implRef = weakImplTable.get(lookupKey);
if (implRef == null) {
implRef = new ImplRef(lookupKey);
weakImplTable.put(lookupKey, implRef);