You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by fb...@apache.org on 2007/10/16 23:24:28 UTC

svn commit: r585264 - in /incubator/river/trunk/jtsk: ./ doc/ doc/release-notes/ doc/specs/html/

Author: fbarnaby
Date: Tue Oct 16 14:24:25 2007
New Revision: 585264

URL: http://svn.apache.org/viewvc?rev=585264&view=rev
Log:
Removed "TM" references, excluded new.html from release, changed additional references of "starter kit", and removed "what's new ..." from index.html . 

Modified:
    incubator/river/trunk/jtsk/build_common.xml
    incubator/river/trunk/jtsk/doc/arch2_0.html
    incubator/river/trunk/jtsk/doc/build.html
    incubator/river/trunk/jtsk/doc/info-index.html
    incubator/river/trunk/jtsk/doc/manpages-index.html
    incubator/river/trunk/jtsk/doc/release-notes/activation.html
    incubator/river/trunk/jtsk/doc/release-notes/browser.html
    incubator/river/trunk/jtsk/doc/release-notes/bugfixes.html
    incubator/river/trunk/jtsk/doc/release-notes/comsunjinithread.html
    incubator/river/trunk/jtsk/doc/release-notes/discovery.html
    incubator/river/trunk/jtsk/doc/release-notes/evseqnums.html
    incubator/river/trunk/jtsk/doc/release-notes/execpolicy.html
    incubator/river/trunk/jtsk/doc/release-notes/fiddler.html
    incubator/river/trunk/jtsk/doc/release-notes/index.html
    incubator/river/trunk/jtsk/doc/release-notes/jeri.html
    incubator/river/trunk/jtsk/doc/release-notes/join.html
    incubator/river/trunk/jtsk/doc/release-notes/lease.html
    incubator/river/trunk/jtsk/doc/release-notes/loader.html
    incubator/river/trunk/jtsk/doc/release-notes/mahalo.html
    incubator/river/trunk/jtsk/doc/release-notes/mercury.html
    incubator/river/trunk/jtsk/doc/release-notes/new.html
    incubator/river/trunk/jtsk/doc/release-notes/norm.html
    incubator/river/trunk/jtsk/doc/release-notes/outrigger.html
    incubator/river/trunk/jtsk/doc/release-notes/reggie.html
    incubator/river/trunk/jtsk/doc/release-notes/servicediscovery.html
    incubator/river/trunk/jtsk/doc/spec-index.html
    incubator/river/trunk/jtsk/doc/specs/html/devicearch-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/discovery-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/discoveryutil-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/entry-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/event-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/jini-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/joinutil-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/js-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/lds-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/lease-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/leaseutil-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/lookup-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/lrs-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/mailbox-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/schema-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/servicediscutil-spec.html
    incubator/river/trunk/jtsk/doc/specs/html/txn-spec.html
    incubator/river/trunk/jtsk/index.html

Modified: incubator/river/trunk/jtsk/build_common.xml
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/build_common.xml?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/build_common.xml (original)
+++ incubator/river/trunk/jtsk/build_common.xml Tue Oct 16 14:24:25 2007
@@ -342,6 +342,7 @@
 				<include name="doc/manpages-index.html"/>
 				<include name="doc/proxypreparation.pdf"/>
 				<include name="doc/release-notes/**"/>
+				<exclude name="doc/release-notes/new.html"/>
 				<include name="doc/simpleproxyverification.pdf"/>
 				<include name="doc/smartproxyverification.pdf"/>
 				<include name="doc/spec-index.html"/>
@@ -382,6 +383,7 @@
 				<include name="doc/manpages-index.html"/>
 				<include name="doc/proxypreparation.pdf"/>
 				<include name="doc/release-notes/**"/>
+				<exclude name="doc/release-notes/new.html"/>
 				<include name="doc/simpleproxyverification.pdf"/>
 				<include name="doc/smartproxyverification.pdf"/>
 				<include name="doc/spec-index.html"/>
@@ -428,6 +430,7 @@
 				<include name="doc/manpages-index.html"/>
 				<include name="doc/proxypreparation.pdf"/>
 				<include name="doc/release-notes/**"/>
+				<exclude name="doc/release-notes/new.html"/>
 				<include name="doc/simpleproxyverification.pdf"/>
 				<include name="doc/smartproxyverification.pdf"/>
 				<include name="doc/spec-index.html"/>
@@ -476,6 +479,7 @@
 				<include name="doc/manpages-index.html"/>
 				<include name="doc/proxypreparation.pdf"/>
 				<include name="doc/release-notes/**"/>
+				<exclude name="doc/release-notes/new.html"/>
 				<include name="doc/simpleproxyverification.pdf"/>
 				<include name="doc/smartproxyverification.pdf"/>
 				<include name="doc/spec-index.html"/>

Modified: incubator/river/trunk/jtsk/doc/arch2_0.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/arch2_0.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/arch2_0.html (original)
+++ incubator/river/trunk/jtsk/doc/arch2_0.html Tue Oct 16 14:24:25 2007
@@ -62,7 +62,7 @@
 <li> Lease Renewal Service (norm)
 <li> Event Mailbox Service (mercury)
 <li> Lookup Discovery Service (fiddler)
-<li> JavaSpaces(TM) Service (outrigger)
+<li> JavaSpaces Service (outrigger)
 </ul>
 
 <p>The Apache River v2.0 release adds components to the first two

Modified: incubator/river/trunk/jtsk/doc/build.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/build.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/build.html (original)
+++ incubator/river/trunk/jtsk/doc/build.html Tue Oct 16 14:24:25 2007
@@ -19,12 +19,12 @@
 <body text="#000000" bgcolor="#ffffff" link="#9b37cc"
       vlink="#cc1877" alink="#ffffff">
 
-<title>Building the Jini(TM) Technology Packages</title>
+<title>Building the Jini Technology Packages</title>
 <a name="TOP">
-<center><h1>Building the Jini(TM) Technology Packages</h1></center>
+<center><h1>Building the Jini Technology Packages</h1></center>
 
 <br>
-The Jini(TM) Technology Starter Kit (starter kit) includes support for 
+The Jini Technology Starter Kit (starter kit) includes support for 
 generating binary (JAR) files and documentation from the provided source code
 using the Apache Ant build tool (available from the Ant project site at
 Apache.org, <a href="http://ant.apache.org">

Modified: incubator/river/trunk/jtsk/doc/info-index.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/info-index.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/info-index.html (original)
+++ incubator/river/trunk/jtsk/doc/info-index.html Tue Oct 16 14:24:25 2007
@@ -131,7 +131,7 @@
 	    How it is Used in the Apache River release</a>
 	<LI><a href="../doc/release-notes/execpolicy.html">Security Requirements on Activation 
 	    Group Descriptors used with <code>phoenix</code> or <code>rmid</code></a>
-	<LI><a href="../doc/release-notes/evseqnums.html">Note on JavaSpaces(TM) Technology, 
+	<LI><a href="../doc/release-notes/evseqnums.html">Note on JavaSpaces Technology, 
 	    Persistent Outrigger Services, and Event Sequence Numbers</a>
         <LI><a href= "../doc/specs/html/devicearch-spec.html">Device Architecture</a>
 	</UL>

Modified: incubator/river/trunk/jtsk/doc/manpages-index.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/manpages-index.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/manpages-index.html (original)
+++ incubator/river/trunk/jtsk/doc/manpages-index.html Tue Oct 16 14:24:25 2007
@@ -47,7 +47,7 @@
 	Norm</a> - a Jini lease renewal service
 
 	<li><a href="../doc/api/com/sun/jini/outrigger/package-summary.html">
-	Outrigger</a> - a JavaSpaces(TM) service
+	Outrigger</a> - a JavaSpaces service
 
 	<li><a href="../doc/api/com/sun/jini/phoenix/package-summary.html">
 	Phoenix</a> - a configurable Java RMI activation system daemon

Modified: incubator/river/trunk/jtsk/doc/release-notes/activation.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/activation.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/activation.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/activation.html Tue Oct 16 14:24:25 2007
@@ -26,9 +26,9 @@
 <br>in the Apache River Release</h1></center>
  
 
-All of the contributed Jini(TM) technology-enabled service (<em>Jini
+All of the contributed Jini technology-enabled service (<em>Jini
 service</em>) implementations in the Apache River release 
-(<em>starter kit</em>) support three modes of operation: transient,
+support three modes of operation: transient,
 persistent/non-activatable, and persistent/activatable.  The lifecycle of
 the services in the first two modes is relatively straightforward and is
 similar to the lifecycles of most other network services written in the
@@ -47,7 +47,7 @@
 are started and run.
 <p>
 
-If you are new to the starter kit or doing day-to-day development, you
+If you are new to the Apache River release or doing day-to-day development, you
 probably don't need to use the activatable mode of the contributed
 implementations. The non-activatable modes are considerably simpler to deal
 with and understand. The activatable mode may be necessary or helpful in
@@ -72,7 +72,7 @@
 <li><em>Demand driven activation</em> &#151; An activatable service can be
 written in such a way that it only requires a running VM when it is
 servicing a client request. Note that the contributed service
-implementations in the starter kit do not exploit this feature of
+implementations in the Apache River release do not exploit this feature of
 activation.
 
 </ul>
@@ -128,7 +128,7 @@
 necessary. The service can be registered with the activation daemon in such
 a way that the activation daemon will automatically restart a crashed
 service even if there are no active clients. This is in fact how all of the
-starter kit's activatable services register themselves. The other way to
+activatable services register themselves. The other way to
 register with the activation daemon is demand driven &#151; to have it
 (re)start the service only when a client invokes a remote method of the
 service.
@@ -172,7 +172,7 @@
 persistent references.  With Jini extensible method invocation (Jini ERI)
 there are two ways to create persistent references. One way is to use
 activation. The second way is to create references with fixed ports and
-object IDs. The package documentation for each of the starter kit's
+object IDs. The package documentation for each of the 
 contributed service implementations includes example configurations
 demonstrating how this can be done.
 <p>
@@ -198,7 +198,7 @@
 daemon, and any other services registered with it, intact and
 available. When the <a
 href=../api/com/sun/jini/example/browser/package-summary.html>example
-service browser</a> that ships with the starter kit is started with the
+service browser</a> that ships with the Apache River release is started with the
 <code>folderView</code> configuration entry set to <code>true</code> (which
 is the default), it can be used to destroy services that implement
 <code>DestroyAdmin</code>.
@@ -335,7 +335,7 @@
 
 The second is <a
 href=../api/com/sun/jini/phoenix/package-summary.html>phoenix</a>, which is
-part of the starter kit. Phoenix has better support for Jini ERI, is
+part of the release. Phoenix has better support for Jini ERI, is
 configurable, and supports <code>net.jini.security</code>, making it
 suitable for a much broader range of deployments than <code>rmid</code>.
 <p>

Modified: incubator/river/trunk/jtsk/doc/release-notes/browser.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/browser.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/browser.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/browser.html Tue Oct 16 14:24:25 2007
@@ -49,8 +49,8 @@
 <dd>The security policy file for the Service Browser must now grant
 permissions to <code>jsk-lib.jar</code>.
 <p>
-<dt><b>Browsing JavaSpaces(TM) service entries</b>
-<dd>The Service Browser can now browse the entries of a JavaSpaces(TM)
+<dt><b>Browsing JavaSpaces service entries</b>
+<dd>The Service Browser can now browse the entries of a JavaSpaces
 service that implements the
 <a href="../api/net/jini/space/JavaSpace05.html"><code>JavaSpace05</code></a>
 interface.

Modified: incubator/river/trunk/jtsk/doc/release-notes/bugfixes.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/bugfixes.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/bugfixes.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/bugfixes.html Tue Oct 16 14:24:25 2007
@@ -1669,7 +1669,7 @@
  href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6249499">6249499</a></td>
         <td>Hello example logging.properties should include/document
 all
-applicable starter kit loggers </td>
+applicable loggers </td>
       </tr>
       <tr>
         <td style="vertical-align: top;"><a

Modified: incubator/river/trunk/jtsk/doc/release-notes/comsunjinithread.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/comsunjinithread.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/comsunjinithread.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/comsunjinithread.html Tue Oct 16 14:24:25 2007
@@ -35,7 +35,7 @@
 The <code>com.sun.jini.thread</code> package contains various
 thread-related utility classes and interfaces. These classes and interfaces
 are not intended for general use, but are used internally by other parts of
-the Jini(TM) Technology Starter Kit (starter kit). Some of these classes
+the Apache River release. Some of these classes
 and interfaces are exposed via the configuration mechanism.
 
 <H3>Changes since the v2.0.1 release</H3>
@@ -44,8 +44,8 @@
 href="../api/com/sun/jini/thread/WakeupManager.html">
 <code>com.sun.jini.thread.WakeupManager</code></a>.
 <code>WakeupManager</code> instances are used to schedule tasks that need
-to be run in the future. Many of the services and utilities in the starter
-kit obtain the required <code>WakeupManager</code> instances from their
+to be run in the future. Many of the services and utilities in the release
+obtain the required <code>WakeupManager</code> instances from their
 configuration. <p>
 
 <dl>

Modified: incubator/river/trunk/jtsk/doc/release-notes/discovery.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/discovery.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/discovery.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/discovery.html Tue Oct 16 14:24:25 2007
@@ -21,16 +21,16 @@
       vlink="#cc1877" alink="#ffffff">
 
 
-<title>Jini(TM) Discovery Utilities Release Notes</title>
+<title>Jini Discovery Utilities Release Notes</title>
 
 <center>
-<h1>Jini(TM) Discovery Utilities<BR>
+<h1>Jini Discovery Utilities<BR>
 v2.1.1 Release Notes</h1>
 </center>
 <HR>
 <UL>
 <H3>Description</H3>
-The Jini(TM) discovery utilities contain
+The Jini discovery utilities contain
 a set of discovery management interfaces that define the policies to
 apply when implementing helper utilities that manage an entity's
 discovery duties: in particular, the management of multicast (group)
@@ -63,7 +63,7 @@
     <code>com.sun.jini.discovery</code></a>
   </ul>
 <p>
-The <i>Jini(TM) Discovery Utilities Specification</i> is available in
+The <i>Jini Discovery Utilities Specification</i> is available in
 <a href="../specs/html/discoveryutil-spec.html">html</a>.
 
 <p>

Modified: incubator/river/trunk/jtsk/doc/release-notes/evseqnums.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/evseqnums.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/evseqnums.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/evseqnums.html Tue Oct 16 14:24:25 2007
@@ -19,19 +19,19 @@
 
 <html>
 <head>
-  <title>Note on JavaSpaces(TM) Technology, Persistent Outrigger Services, and Event Sequence Numbers
+  <title>Note on JavaSpaces Technology, Persistent Outrigger Services, and Event Sequence Numbers
   </title>
 </head>
 
 <body text="black" bgcolor="white" link="#9b37cc" vlink="#cc1877" alink="white">
 <center>
-<h1>Note on JavaSpaces(TM) Technology, Persistent Outrigger Services, and Event Sequence Numbers
+<h1>Note on JavaSpaces Technology, Persistent Outrigger Services, and Event Sequence Numbers
 </code></h1>
 </center>
 <p>
-Previously the <i>JavaSpaces(TM) Service Specification</i> required that
+Previously the <i>JavaSpaces Service Specification</i> required that
 event sequence numbers associated with spaces events to be <em>fully
-ordered</em>.  Fully ordered, as defined in the <i>Jini(TM) Distributed
+ordered</em>.  Fully ordered, as defined in the <i>Jini Distributed
 Event Specification</i>, requires that:
 <blockquote>
 	... not only do sequence numbers increase, but they are not
@@ -48,7 +48,7 @@
 <p>
 In the Fall of 2000, we received feedback (from Asaf Kariv of GigaSpaces
 Technologies Ltd.) stating that requiring event sequence numbers to be fully
-ordered places too high a burden on implementors of the <i>JavaSpaces(TM)
+ordered places too high a burden on implementors of the <i>JavaSpaces
 Service Specification</i> (GigaSpaces is a vender of a commercial JavaSpaces
 service implementation).  For example, the guarantee requires a persistent
 implementation to store sufficient information <em>during</em> each
@@ -67,10 +67,10 @@
 After substantial discussions within the Jini Community(SM) for more than a
 year, we came to the conclusion that weakening the fully ordered guarantee
 would be unlikely to have significant negative impact on users of
-JavaSpaces technology. As a result, in the 1.2 FCS release of the Jini(TM)
-Technology Starter Kit (starter kit) we changed the <i>JavaSpaces(TM)
+JavaSpaces technology. As a result, in the 1.2 FCS release,  
+we changed the <i>JavaSpaces
 Service Specification</i> so that only the basic guarantee required by the
-<i>Jini(TM) Distributed Event Specification</i> on event sequences numbers
+<i>Jini Distributed Event Specification</i> on event sequences numbers
 is called for. This basic guarantee requires that all sequence numbers are
 unique and ordered, but that gaps in the sequence do not necessarily imply
 that events have been missed.  Put another way, if two remote events
@@ -80,14 +80,14 @@
 but the difference between the two sequence numbers implies nothing about
 how many events may or may not have occurred between <I>x</I> and <I>y</I>.
 <p>
-A related issue is that previous editions of the <i>JavaSpaces(TM) Service
+A related issue is that previous editions of the <i>JavaSpaces Service
 Specification</i> specifically allowed implementations to "compress" event
 deliveries because sequence numbers were fully ordered. This rasises the
 questions &#151; is compression still allowed? and should we be
 calling it out in the specification? It was decided that the event
 specification does allow for event notifications to be dropped even when
 only the basic sequence number guarantee is present, and that it was not
-necessary to call this possibility out in the <i>JavaSpaces(TM) Service
+necessary to call this possibility out in the <i>JavaSpaces Service
 Specification</i>.
 
 <h2>What This Means for Persistent Outrigger Services</h2>

Modified: incubator/river/trunk/jtsk/doc/release-notes/execpolicy.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/execpolicy.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/execpolicy.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/execpolicy.html Tue Oct 16 14:24:25 2007
@@ -24,11 +24,11 @@
 </H1>
  <ul>
 
-<p>Some Jini(TM) network technology-based services may be activatable and
+<p>Some Jini network technology-based services may be activatable and
 as such will require the use of an activation daemon.  The standard
 Java(TM) 2 Standard Edition (J2SE(TM)) Remote Method Invocation (Java RMI) activation daemon is
-<code>rmid</code>.  The Jini Technology Starter Kit (starter kit),
-v2.0 release provides <code>phoenix</code>, an alternative
+<code>rmid</code>.  The Apache River release
+provides <code>phoenix</code>, an alternative
 configurable implementation of a Java RMI activation daemon.
 
 <p>This note describes the security requirements to specify an
@@ -424,7 +424,7 @@
 </PRE>
 <P>
 Here's one for <CODE>FrontEndSpace</CODE> (a contributed implementation of
-JavaSpaces(TM) technology from Sun Microsystems) in the Solaris OS:
+JavaSpaces technology from Sun Microsystems) in the Solaris OS:
 <PRE>
   grant {
     permission com.sun.rmi.rmid.ExecOptionPermission

Modified: incubator/river/trunk/jtsk/doc/release-notes/fiddler.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/fiddler.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/fiddler.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/fiddler.html Tue Oct 16 14:24:25 2007
@@ -28,12 +28,12 @@
 <hr>
 <UL>
 <H3>Description</H3>
-"Fiddler" is the name of the contributed Jini(TM) technology lookup discovery
-service implementation from Sun Microsystems. The <i>Jini(TM) Lookup 
+"Fiddler" is the name of the contributed Jini technology lookup discovery
+service implementation from Sun Microsystems. The <i>Jini Lookup 
 Discovery Service Specification</i> is available in <a
 href="../specs/html/lds-spec.html">html</a>.
 <p>
-The specification for Fiddler is defined not only by the <i>Jini(TM) Lookup 
+The specification for Fiddler is defined not only by the <i>Jini Lookup 
 Discovery Service Specification</i>, but also by the API
 documentation (generated by the Javadoc(TM) tool) for
 <a href="../api/com/sun/jini/fiddler/FiddlerAdmin.html"> <code>com.sun.jini.fiddler.FiddlerAdmin</code></a>

Modified: incubator/river/trunk/jtsk/doc/release-notes/index.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/index.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/index.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/index.html Tue Oct 16 14:24:25 2007
@@ -48,7 +48,7 @@
 <hr>
 <ul>
 <p>
-If you would like to submit a bug against the starter kit, please use the
+If you would like to submit a bug against the Apache River release, please use the
 <a href="http://developer.java.sun.com/developer/bugParade/index.jshtml">Bug Parade</a>.
 If you encounter problems that you would like help with, you can subscribe
 to the <code>jini-users</code> list by sending email to <code>listserv@java.sun.com</code>,
@@ -83,7 +83,7 @@
 </ul>
 <h3>Other</h3>
 <ul>
-	<li><a href="jeri.html">Jini(TM) extensible remote invocation (Jini ERI)</a>
+	<li><a href="jeri.html">Jini extensible remote invocation (Jini ERI)</a>
 	<li><a href="loader.html">Class loader</a>
 	<li><a href="security.html">Security</a>
 	<li><a href="activate.html">Activation</a>
@@ -213,7 +213,7 @@
 <p>
 It is important to understand that the contents of this JAR file do <i>not</i>
 constitute a "standard" platform; this JAR file is simply our choice of
-<i>a</i> platform likely to be useful for deployments of this starter kit.
+<i>a</i> platform likely to be useful for deployments of this release.
 Depending on your deployment requirements, you may want to alter the contents
 of this JAR file (but if you do so, you also might have to make changes to
 other JAR files).
@@ -261,7 +261,7 @@
 <p><dt><b><code>jsk-lib.jar</code></b>
 <dd>
 This JAR file is referenced in the <code>Class-Path</code> manifest attribute
-of many starter kit implementation JAR files, and contains the utility
+of many Apache River release implementation JAR files, and contains the utility
 APIs that are not tied to a specific service implementation.
 <p>
 This JAR file contains all of the classes and interfaces in the
@@ -420,7 +420,7 @@
 <p><dt><b><code>norm-dl.jar</code></b>
 <dd>The codebase JAR file for Norm.
 <p><dt><b><code>outrigger.jar</code></b>
-<dd>The service JAR file for the <a href="../api/com/sun/jini/outrigger/package-summary.html">Outrigger</a> implementation of the JavaSpaces(TM) service.
+<dd>The service JAR file for the <a href="../api/com/sun/jini/outrigger/package-summary.html">Outrigger</a> implementation of the JavaSpaces service.
 <p><dt><b><code>outrigger-dl.jar</code></b>
 <dd>The codebase JAR file for Outrigger.
 <p><dt><b><code>reggie.jar</code></b>
@@ -494,7 +494,7 @@
 <p><dt><b><code>prebuilt-outrigger-logstore.jar</code></b>
 <dd>A secondary JAR file containing specially postprocessed classes in
 <code>outrigger-logstore.jar</code>. This JAR file is never used at runtime,
-it is only used if you attempt to rebuild the starter kit from sources and
+it is only used if you attempt to rebuild the Apache River release from sources and
 do not have the necessary ObjectStore PSE Pro for Java postprocessor tool.
 In practice you should not need to refer directly to this JAR file.
 
@@ -507,7 +507,7 @@
 <code>net.jini.core</code> namespace. No direct use of this JAR file
 is made in this release; it is simply provided as a possible convenience
 to developers. This JAR file has been deprecated in this release and might
-not be supplied in future versions of the starter kit.
+not be supplied in future versions of the Apache River release.
 <p><dt><b><code>jini-ext.jar</code></b>
 <dd>This JAR file contains all of the classes and interfaces in the
 <code>net.jini</code> namespace, plus all of the classes and interfaces
@@ -523,7 +523,7 @@
 appear in this JAR file should be considered implementation details. No
 direct use of this JAR file is made in this release; it is simply provided
 as a possible convenience to developers. This JAR file has been deprecated
-in this release and might not be supplied in future versions of the starter kit.
+in this release and might not be supplied in future versions of the Apache River release.
 <p><dt><b><code>sdm-dl.jar</code></b>
 <dd>This JAR file contains proxy and trust verifier classes that generally
 need to be included in the codebase of any application that uses the
@@ -531,7 +531,7 @@
 <a href="../api/net/jini/lookup/ServiceDiscoveryManager.html">
 <code>ServiceDiscoveryManager</code></a> provided in this release.
 This JAR file has been deprecated in this release and might not be supplied
-in future versions of the starter kit. The function provided by this JAR file
+in future versions of the Apache River release. The function provided by this JAR file
 has been replaced by <code>jsk-dl.jar</code>.
 <p><dt><b><code>sun-util.jar</code></b>
 <dd>This JAR file contains various classes and interfaces in the
@@ -542,7 +542,7 @@
 claims about the API stability of these classes and interfaces. No direct
 use of this JAR file is made in this release; it is simply provided as a
 possible convenience to developers. This JAR file has been deprecated in
-this release and might not be supplied in future versions of the starter kit.
+this release and might not be supplied in future versions of the Apache River release.
 </dl>
 </ul>
 <hr>

Modified: incubator/river/trunk/jtsk/doc/release-notes/jeri.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/jeri.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/jeri.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/jeri.html Tue Oct 16 14:24:25 2007
@@ -33,7 +33,7 @@
 
 <p>The <a
 href="../api/net/jini/jeri/package-summary.html"><code>net.jini.jeri</code></a>
-package and its subpackages provide APIs for Jini(TM) extensible remote
+package and its subpackages provide APIs for Jini extensible remote
 invocation (Jini ERI) and several Jini ERI transport layer providers.
 
 <H3>Changes since the v2.0.1 release</H3>

Modified: incubator/river/trunk/jtsk/doc/release-notes/join.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/join.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/join.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/join.html Tue Oct 16 14:24:25 2007
@@ -21,9 +21,9 @@
       vlink="#cc1877" alink="#ffffff">
 
 
-<title>Jini(TM) Join Utilities Release Notes</title>
+<title>Jini Join Utilities Release Notes</title>
 
-<center><h1>Jini(TM) Join Utilities
+<center><h1>Jini Join Utilities
   <BR>v2.1.1 Release Notes
 </h1></center>
 <HR>
@@ -33,7 +33,7 @@
 The class
 <a href="../api/net/jini/lookup/JoinManager.html"> <code>net.jini.lookup.JoinManager</code></a>
 is a utility class that, along with supporting interfaces and classes, 
-encapsulates functionality that can help Jini(TM) technology-enabled services 
+encapsulates functionality that can help Jini technology-enabled services 
 (<i>Jini services</i>) demonstrate good behavior in their discovery- 
 and registration-related interactions with Jini lookup services. 
 In particular, this utility performs functions related to lookup 
@@ -42,7 +42,7 @@
 <p>
 The specification for the 
 <a href="../api/net/jini/lookup/JoinManager.html"> <code>JoinManager</code></a> 
-utility (join manager) is contained in the  <i>Jini(TM) Join Utilities Specification</i>,
+utility (join manager) is contained in the  <i>Jini Join Utilities Specification</i>,
 which is available in <a href="../specs/html/joinutil-spec.html">html</a>.
 <p>
 

Modified: incubator/river/trunk/jtsk/doc/release-notes/lease.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/lease.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/lease.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/lease.html Tue Oct 16 14:24:25 2007
@@ -21,10 +21,10 @@
       vlink="#cc1877" alink="#ffffff">
 
 
-<title>Jini(TM) Lease Utilities Release Notes</title>
+<title>Jini Lease Utilities Release Notes</title>
 
 <center>
-<h1>Jini(TM) Lease Utilities<BR>
+<h1>Jini Lease Utilities<BR>
 v2.1.1 Release Notes</h1>
 </center>
 <HR>
@@ -33,7 +33,7 @@
 The class <code>net.jini.lease.LeaseRenewalManager</code> is a utility
 class that provides for the systematic renewal and overall management of
 a set of leases associated with one or more remote entities on behalf of
-a local entity.  The <i>Jini(TM) Lease Utilities Specification</i> is
+a local entity.  The <i>Jini Lease Utilities Specification</i> is
 available in <a href="../specs/html/leaseutil-spec.html">html</a>.
 <p>
 

Modified: incubator/river/trunk/jtsk/doc/release-notes/loader.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/loader.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/loader.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/loader.html Tue Oct 16 14:24:25 2007
@@ -122,7 +122,7 @@
 that of a locally available class with the same name and codebase
 annotation.
 
-<p>In versions of the Norm implementation of the Jini(TM) lease
+<p>In versions of the Norm implementation of the Jini lease
 renewal service prior to v2.0, there are some classes in
 <code>norm-dl.jar</code> that are not in <code>norm.jar</code>, and
 thus Norm will fail to start with <code>PreferredClassProvider</code>

Modified: incubator/river/trunk/jtsk/doc/release-notes/mahalo.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/mahalo.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/mahalo.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/mahalo.html Tue Oct 16 14:24:25 2007
@@ -30,8 +30,8 @@
 <HR>
 <UL>
 <H3>Description</H3>
-<p>"Mahalo" is the name of  the contributed Jini(TM) transaction manager 
-implementation from Sun Microsystems. The Jini(TM) Transaction 
+<p>"Mahalo" is the name of  the contributed Jini transaction manager 
+implementation from Sun Microsystems. The Jini Transaction 
 Specification is available in <a
 href="../specs/html/txn-spec.html">HTML</a>.
 <p>
@@ -60,7 +60,7 @@
       4285733: Is the Transaction spec correct about permissible votes?
       </b></dt>
   <dd>Section TX.2.7 of the 
-      Jini (TM) Transaction Specification was changed to correct the permissible
+      Jini Transaction Specification was changed to correct the permissible
       vote outcomes for <code>prepare</code>. Specifically, the 
       <code>COMMITTED</code> vote was changed to <code>PREPARED</code>.
   </dd>
@@ -68,7 +68,7 @@
       4394196: Txn specs fixes
       </b></dt>
   <dd>Section TX.1.3 of the 
-      Jini (TM) Transaction Specification was changed to emphasize that Java(TM)
+      Jini Transaction Specification was changed to emphasize that Java(TM)
       Remote Method Invocation (Java RMI) semantics are replied upon and not any particular
       implementation. Section TX.2.3 removed a confusing "crash count" example. 
       In section TX.2.7, the paragraphs dealing with <code>abort</code> 
@@ -83,7 +83,7 @@
       4761012: prepareAndCommit semantics amibiguous wrt idempotentcy
       </b></dt>
   <dd>Section TX.2.6 & TX.2.7 of the 
-      Jini (TM) Transaction Specification were changed to note that 
+      Jini Transaction Specification were changed to note that 
       <code>prepareAndCommit</code> calls may not be idempotent.
   </dd>
   <dt><b>
@@ -91,7 +91,7 @@
       commit is atomic
       </b></dt>
   <dd>Section TX.3.5 of the 
-      Jini (TM) Transaction Specification was changed to note that 
+      Jini Transaction Specification was changed to note that 
       participants are not required to implement atomic <code>abort</code> and 
       <code>commit</code> calls.
   </dd>  </dl>

Modified: incubator/river/trunk/jtsk/doc/release-notes/mercury.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/mercury.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/mercury.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/mercury.html Tue Oct 16 14:24:25 2007
@@ -30,8 +30,8 @@
 <HR>
 <UL>
 <H3>Description</H3>
-"Mercury" is the name of the contributed Jini(TM) event mailbox
-service implementation from Sun Microsystems. The <i>Jini(TM) Event Mailbox
+"Mercury" is the name of the contributed Jini event mailbox
+service implementation from Sun Microsystems. The <i>Jini Event Mailbox
 Specification</i> is available in <a
 href="../specs/html/mailbox-spec.html">HTML</a>.
 
@@ -42,7 +42,7 @@
 <dl>
 
   <dt> <b>"Pull" Functionality</b>
-  <dd> The Jini(TM) Event Mailbox Service 
+  <dd> The Jini Event Mailbox Service 
        <a href="../specs/html/mailbox-spec.html">Specification</a>
        was augmented with additional classes and
        interfaces that provide synchronous access to 

Modified: incubator/river/trunk/jtsk/doc/release-notes/new.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/new.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/new.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/new.html Tue Oct 16 14:24:25 2007
@@ -69,7 +69,7 @@
     </dd>
     <dt><b><p>
 Licensing change</b> </dt>
-    <dd>Beginning with the v2.1Beta release of the starter kit, Sun is transitioning 
+    <dd>Beginning with the v2.1Beta release, Sun is transitioning 
     to the use of the Apache License, v2.0 for this technology.<p>
       <b>More Information</b>
       <ul>
@@ -101,7 +101,7 @@
     <dt><b><p>
 Tool wrappers</b> </dt>
     <dd>Executable JAR wrapper files have been included for all of the tools
-        included in the starter kit.<p>
+        included in the release.<p>
 
       <b>More Information</b>
       <ul>
@@ -148,14 +148,14 @@
       installing the JAR file into the default J2SE extension directory.
 	<p>
      Two new JAR files, <code>jsk-lib.jar</code> and <code>jsk-dl.jar</code>, 
-     have been introduced to better enable layered systems to use starter kit 
-     JAR files directly in deployments and avoid including starter kit class 
+     have been introduced to better enable layered systems to use  
+     JAR files directly in deployments and avoid including class 
      files in their own layered JAR files. These JAR files are also now used 
-     by the services in the starter kit. The addition of <code>jsk-lib.jar</code> 
+     by the services in the release. The addition of <code>jsk-lib.jar</code> 
      to class paths will affect existing service and browser policy files 
      (permissions must be granted to <code>jsk-lib.jar</code>), and the addition 
      of <code>jsk-dl.jar</code> to codebases will affect existing scripts 
-     and configurations that set up codebases for starter kit services.<p>
+     and configurations that set up codebases for services.<p>
       <b>More Information</b>
       <ul>
         <li><a href="../info-index.html#examine">Getting Started</a></li>

Modified: incubator/river/trunk/jtsk/doc/release-notes/norm.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/norm.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/norm.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/norm.html Tue Oct 16 14:24:25 2007
@@ -30,7 +30,7 @@
 <HR>
 <UL>
 <H3>Description</H3>
-"Norm" is the name of the contributed Jini(TM) technology lease renewal
+"Norm" is the name of the contributed Jini technology lease renewal
 service implementation from Sun Microsystems. The <i>Jini Lease Renewal
 Service Specification</i> is available in <a
 href="../specs/html/lrs-spec.html">html</a>.

Modified: incubator/river/trunk/jtsk/doc/release-notes/outrigger.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/outrigger.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/outrigger.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/outrigger.html Tue Oct 16 14:24:25 2007
@@ -32,7 +32,7 @@
 <ul>
 <H3>Description</H3>
 
-&quot;Outrigger&quot; is the name of the contributed JavaSpaces(TM) service
+&quot;Outrigger&quot; is the name of the contributed JavaSpaces service
 from Sun Microsystems.  The primary interface implemented by Outrigger is the
 <code><a
 href="../api/net/jini/space/JavaSpace05.html">net.jini.space.JavaSpace05</a></code>
@@ -183,8 +183,8 @@
 <dt><b>Outrigger's JAR Files Have Been Restructured</b>
 <dd>
 
-To better support the layering of applications on top of the starter kit
-the starter kit's JAR files, including those related to Outrigger, have
+To better support the layering of applications,
+the JAR files, including those related to Outrigger, have
 been restructured. The changes to the server-side files
 (e.g. <code>outrigger.jar</code>, <code>outrigger-logstore.jar</code>,
 etc.) may require changes to the security policy files used for Outrigger
@@ -193,7 +193,7 @@
 <code>outrigger-dl.jar</code> have an impact on how Outrigger's codebase is
 specified. Outrigger now requires a multi-element codebase that includes
 both <code>outrigger-dl.jar</code> and <code>jsk-dl.jar</code>. Also note
-that all of the starter kit's "<code>-dl.jar</code>" files, including
+that all of the "<code>-dl.jar</code>" files, including
 <code>outrigger-dl.jar</code>, have been moved out of the <code>lib</code>
 directory and into the new <code>lib-dl</code> directory.<p>
 

Modified: incubator/river/trunk/jtsk/doc/release-notes/reggie.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/reggie.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/reggie.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/reggie.html Tue Oct 16 14:24:25 2007
@@ -30,7 +30,7 @@
 <hr>
 <ul>
 <h3>Description</h3>
-"Reggie" is the name of the contributed Jini(TM) lookup service implementation
+"Reggie" is the name of the contributed Jini lookup service implementation
 from Sun Microsystems. The specification for the Jini lookup service is 
 available in <a href="../specs/html/lookup-spec.html">HTML</a>.
 <p/>

Modified: incubator/river/trunk/jtsk/doc/release-notes/servicediscovery.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/release-notes/servicediscovery.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/release-notes/servicediscovery.html (original)
+++ incubator/river/trunk/jtsk/doc/release-notes/servicediscovery.html Tue Oct 16 14:24:25 2007
@@ -21,10 +21,10 @@
       vlink="#cc1877" alink="#ffffff">
 
 
-<title>Jini(TM) Service Discovery Utilities Release Notes</title>
+<title>Jini Service Discovery Utilities Release Notes</title>
 
 <center>
-<h1>Jini(TM) Service Discovery Utilities
+<h1>Jini Service Discovery Utilities
   <BR>v2.1.1 Release Notes
 </h1>
 </center>
@@ -34,14 +34,14 @@
 
 The class
 <a href="../api/net/jini/lookup/ServiceDiscoveryManager.html"> <code>net.jini.lookup.ServiceDiscoveryManager</code></a>
-is a utility class that can be used to help a Jini(TM) technology-enabled 
+is a utility class that can be used to help a Jini technology-enabled 
 service or client (<i>Jini service</i> or <i>Jini client</i>) 
 acquire services of interest that are registered with lookup services 
 with which the service or client wishes to interact.
 <p>
 The specification for the
 <a href="../api/net/jini/lookup/ServiceDiscoveryManager.html"> <code>ServiceDiscoveryManager</code></a>
-utility is contained in the  <i>Jini(TM) Service Discovery Utilities Specification</i>, 
+utility is contained in the  <i>Jini Service Discovery Utilities Specification</i>, 
 which is available in <a href="../specs/html/servicediscutil-spec.html">html</a>.
 <p>
 
@@ -261,7 +261,7 @@
        When a well-behaved service is replaced with a new version, the new
        version is typically reregistered with each lookup service with
        which the old version is registered. As described in the
-       <a href="../specs/html/lookup-spec.html"><i>Jini(TM) Lookup Service Specification</i></a>,
+       <a href="../specs/html/lookup-spec.html"><i>Jini Lookup Service Specification</i></a>,
        each lookup service with which this reregistration process occurs first
        sends a service-removed event (<code>TRANSITION_MATCH_NOMATCH</code>), and
        then sends a separate service-added event (<code>TRANSITION_NOMATCH_MATCH</code>).
@@ -448,7 +448,7 @@
        <p>
        For more information, please refer to the section titled,
        <i>SD.5.2 The <code>ServiceItemFilter</code> Interface</i>, contained in the
-       <a href="../specs/html/servicediscutil-spec.html"><i>Jini(TM) Service Discovery Utilities Specification</i></a>.
+       <a href="../specs/html/servicediscutil-spec.html"><i>Jini Service Discovery Utilities Specification</i></a>.
 
        <p>
        <b>Note 3: The Service Discovery Event Mechanism</b>
@@ -468,7 +468,7 @@
        <p>
        For more information, please refer to the section titled,
        <i>SD.5.4 The <code>ServiceDiscoveryListener</code> Interface</i>, contained in the
-       <a href="../specs/html/servicediscutil-spec.html"><i>Jini(TM) Service Discovery Utilities Specification</i></a>
+       <a href="../specs/html/servicediscutil-spec.html"><i>Jini Service Discovery Utilities Specification</i></a>
        <p>
 </dl>
 

Modified: incubator/river/trunk/jtsk/doc/spec-index.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/spec-index.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/spec-index.html (original)
+++ incubator/river/trunk/jtsk/doc/spec-index.html Tue Oct 16 14:24:25 2007
@@ -67,7 +67,7 @@
 <HR>
 	<ul><ul>
     	<li><a href="../doc/specs/html/js-spec.html"><i>
-	    JavaSpaces(TM) Service Specification</i></a>
+	    JavaSpaces Service Specification</i></a>
 	</ul></ul>
 <HR>
 <UL><UL>

Modified: incubator/river/trunk/jtsk/doc/specs/html/devicearch-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/devicearch-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/devicearch-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/devicearch-spec.html Tue Oct 16 14:24:25 2007
@@ -23,7 +23,7 @@
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <meta name="LASTUPDATED" content="Wed Oct 25 11:09:21 2000">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Device Architecture Specification</title>
+<title>Jini Device Architecture Specification</title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -31,7 +31,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><td align=left><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><i>Jini(TM) Device Architecture Specification</i></td>
+<td align=right><i>Jini Device Architecture Specification</i></td>
 </tr>
 </table>
 <a name="skip"></a>
@@ -257,7 +257,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>Jini(TM) Device Architecture Specification</em></td>
+<td align=right><em>Jini Device Architecture Specification</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/discovery-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/discovery-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/discovery-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/discovery-spec.html Tue Oct 16 14:24:25 2007
@@ -22,14 +22,14 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Discovery & Join Specification</title>
+<title>Jini Discovery & Join Specification</title>
 </head>
 <body bgcolor="#ffffff">
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="90%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+<td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr>
 </table>
 <a name="skip"></a>
@@ -1753,7 +1753,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-</td><td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+</td><td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/discoveryutil-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/discoveryutil-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/discoveryutil-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/discoveryutil-spec.html Tue Oct 16 14:24:25 2007
@@ -24,7 +24,7 @@
 <meta name="TEMPLATEBASE" content="JiniSpec1.1alpha">
 <meta name="LASTUPDATED" content="Mar 5, 2003">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Discovery Utilities Specification - DU </title>
+<title>Jini Discovery Utilities Specification - DU </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -33,7 +33,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><td align=left><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><i>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications
+<td align=right><i>A Collection of Jini Technology Helper Utilities and Services Specifications
 </i></td>
 </tr>
 </table>
@@ -1705,7 +1705,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-</td><td align=right><i>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</i></td>
+</td><td align=right><i>A Collection of Jini Technology Helper Utilities and Services Specifications</i></td>
 </tr>
 </table>
 <a name="skip"></a>

Modified: incubator/river/trunk/jtsk/doc/specs/html/entry-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/entry-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/entry-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/entry-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Entry Specification</title>
+<title>Jini Entry Specification</title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -32,7 +32,7 @@
 <table width="90%"><td align=left>
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+<td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -229,7 +229,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><i>Jini(TM) Technology Core Platform Specifications</i></td>
+<td align=right><i>Jini Technology Core Platform Specifications</i></td>
 </tr>
 </table>
 <a name="skip"></a>

Modified: incubator/river/trunk/jtsk/doc/specs/html/event-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/event-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/event-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/event-spec.html Tue Oct 16 14:24:25 2007
@@ -24,7 +24,7 @@
 <meta name="TEMPLATEBASE" content="JiniSpec1.1alpha">
 <meta name="LASTUPDATED" content="Tue Oct 17 17:18:04 2000">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Distributed Events Specification</title>
+<title>Jini Distributed Events Specification</title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -33,7 +33,7 @@
 <table width="90%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>Jini(TM) Distributed Events Specifications</em></td>
+<td align=right><em>Jini Distributed Events Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -125,7 +125,7 @@
   <a name="1004346"> </a>An object is responsible for identifying the kinds of events that can occur within that object, allowing other objects to register interest in the occurrence of such events, and generating <code>RemoteEvent</code> objects that are sent as notifications to the objects that have registered interest when such events occur. 
 </p>
 <p class="Body">
-  <a name="1004347"> </a>Registration of interest is not temporally open ended but is limited to a given duration using the notion of a lease. Full specification of the way in which leasing is used is contained in the <em><a href="lease-spec.html#1034275">Jini(TM) Distributed Leasing Specification</a></em>.
+  <a name="1004347"> </a>Registration of interest is not temporally open ended but is limited to a given duration using the notion of a lease. Full specification of the way in which leasing is used is contained in the <em><a href="lease-spec.html#1034275">Jini Distributed Leasing Specification</a></em>.
 </p>
 <p class="Body">
   <a name="1004348"> </a>The basic, concrete objects involved in a distributed event system are:
@@ -648,7 +648,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>Jini(TM) Distributed Events Specifications</em></td>
+<td align=right><em>Jini Distributed Events Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/jini-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/jini-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/jini-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/jini-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Architecture Specification</title>
+<title>Jini Architecture Specification</title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -31,7 +31,7 @@
 <table width="90%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><i>Jini(TM) Architecture Specification</i></td>
+<td align=right><i>Jini Architecture Specification</i></td>
 </tr>
 </table>
 <a name="skip"></a>
@@ -518,7 +518,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>Jini(TM) Architecture Specification</em></td>
+<td align=right><em>Jini Architecture Specification</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/joinutil-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/joinutil-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/joinutil-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/joinutil-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Join Utilities Specification  </title>
+<title>Jini Join Utilities Specification  </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -32,7 +32,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><i>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</i></td>
+<td align=right><i>A Collection of Jini Technology Helper Utilities and Services Specifications</i></td>
 </tr>
 </table>
 <br clear="all">
@@ -63,13 +63,13 @@
   <a name="1015670"> </a>JU.2	 The <code>JoinManager</code>
 </h3>
 <p class="Body">
-  <a name="1016181"> </a>The goal of any well-behaved Jini service, implemented within the bounds defined by the Jini technology programming model, is to advertise the service it provides by requesting residency within at least one Jini lookup service. Making such a request of a Jini lookup service is known as registering with, or <em class="Emphasis">joining</em>, a lookup service. To demonstrate this good behavior, a service must comply with both the multicast discovery protocol and the unicast discovery protocol to discover the lookup services it is interested in joining. The service must also comply with the join protocol to register with the desired lookup services. The details of the discovery and join protocols are described in the <a href="discovery-spec.html"><em class="Emphasis">Jini(TM) Technology Discovery and Join Specification</em></a>.
+  <a name="1016181"> </a>The goal of any well-behaved Jini service, implemented within the bounds defined by the Jini technology programming model, is to advertise the service it provides by requesting residency within at least one Jini lookup service. Making such a request of a Jini lookup service is known as registering with, or <em class="Emphasis">joining</em>, a lookup service. To demonstrate this good behavior, a service must comply with both the multicast discovery protocol and the unicast discovery protocol to discover the lookup services it is interested in joining. The service must also comply with the join protocol to register with the desired lookup services. The details of the discovery and join protocols are described in the <a href="discovery-spec.html"><em class="Emphasis">Jini Technology Discovery and Join Specification</em></a>.
 </p>
 <p class="Body">
   <a name="1016156"> </a>For the service to maintain its residency in the lookup services it has joined, the service must provide for the coordination, systematic renewal, and overall management of all leases on that residency. In addition to handling all discovery and join duties, as well as managing all leases on lookup service residency, the service must provide for the coordination and management of any attribute sets with which it may have registered.
 </p>
 <p class="Body">
-  <a name="1016215"> </a>With respect to the duties described above, a Jini service may perform all but the attribute set management duties by using the helper utility classes <code>LookupDiscoveryManager</code> and <code>LeaseRenewalManager</code>. (For information on these classes, refer to the <a href="discoveryutil-spec.html"><em class="Emphasis">Jini(TM) Discovery Utilities Specification</em>, Section DU.5, "The LookupDiscoveryManager Utility"</a>,  and the <a href="leaseutil-spec.html"><em class="Emphasis">Jini(TM) Lease Utilities Specification</em>, Section LM.2, "The LeaseRenewalManager"</a>).
+  <a name="1016215"> </a>With respect to the duties described above, a Jini service may perform all but the attribute set management duties by using the helper utility classes <code>LookupDiscoveryManager</code> and <code>LeaseRenewalManager</code>. (For information on these classes, refer to the <a href="discoveryutil-spec.html"><em class="Emphasis">Jini Discovery Utilities Specification</em>, Section DU.5, "The LookupDiscoveryManager Utility"</a>,  and the <a href="leaseutil-spec.html"><em class="Emphasis">Jini Lease Utilities Specification</em>, Section LM.2, "The LeaseRenewalManager"</a>).
 </p>
 <p class="Body">
   <a name="1002807"> </a>Rather than writing a service to use these classes in a coordinated fashion (in addition to providing for attribute management), the service may be written to employ the <code>JoinManager</code> class from the <code>net.jini.lookup</code> package. This utility class performs all of the functions related to discovery, joining, service lease renewal, and attribute management that the Jini technology programming model requires of a well-behaved Jini service. Each of these activities is intimately involved with the maintenance of a service's residency in one or more lookup services (the service's <em class="Emphasis">join state</em>), hence the name <code>JoinManager</code>.
@@ -260,7 +260,7 @@
 <p class="Body">
 An invocation of either form of this method with duplicate elements in the <code>attrSets</code> parameter (where duplication means attribute equality as defined by calling the <code>MarshalledObject.equals</code> method on field values) is equivalent to performing the invocation with the duplicates removed from that parameter. If <code>null</code> is passed in as the value of this parameter, a <code>NullPointerException</code> will be thrown.
 <p class="Body">
-The second form of this method also takes as input a flag indicating whether or not this method should determine if the attributes in the input set are instances of the <code>ServiceControlled</code> interface, which is a marker interface that is used to control which entities may modify a service's attribute set. For more information on this interface, refer to the <a href="schema-spec.html"><em>Jini(TM) Lookup Attribute Schema Specification</em>, Section LS.4.1, "Indicating User Modifiability"</a>. If the value of this flag is true and at least one of the attributes to be added is an instance of the <code>ServiceControlled</code> interface, a <code>SecurityException</code> will be thrown and propagated through this method.
+The second form of this method also takes as input a flag indicating whether or not this method should determine if the attributes in the input set are instances of the <code>ServiceControlled</code> interface, which is a marker interface that is used to control which entities may modify a service's attribute set. For more information on this interface, refer to the <a href="schema-spec.html"><em>Jini Lookup Attribute Schema Specification</em>, Section LS.4.1, "Indicating User Modifiability"</a>. If the value of this flag is true and at least one of the attributes to be added is an instance of the <code>ServiceControlled</code> interface, a <code>SecurityException</code> will be thrown and propagated through this method.
 <p class="Body">
 Note that because there is no guarantee that attribute propagation will have completed upon return from this method, services that invoke this method must take care not to modify the contents of the input array. Doing so could cause the service's attribute state to be corrupted or inconsistent on a subset of the lookup services with which the service is registered as compared with the state reflected on the remaining lookup services. It is for this reason that the effects of modifying the contents of the input array, after this method is invoked, are undefined.
 <p class="Body">
@@ -407,7 +407,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-</td><td align=right><i>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</i></td>
+</td><td align=right><i>A Collection of Jini Technology Helper Utilities and Services Specifications</i></td>
 </tr>
 </table>
 <a name="skip"></a>

Modified: incubator/river/trunk/jtsk/doc/specs/html/js-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/js-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/js-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/js-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>JavaSpaces(TM) Service Specification</title>
+<title>JavaSpaces Service Specification</title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -31,7 +31,7 @@
 <table width="90%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>JavaSpaces(TM) Service Specification</em></td>
+<td align=right><em>JavaSpaces Service Specification</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -54,13 +54,13 @@
    Distributed systems are hard to build. They require careful thinking about problems that do not occur in local computation. The primary problems are those of partial failure, greatly increased latency, and language compatibility. The Java(TM) programming language has a remote method invocation system called RMI that lets you approach general distributed computation in the Java<TM) programming language using techniques natural to the Java programming language and application environment. This is layered on the Java platform's object serialization mechanism to marshal parameters of remote methods into a form that can be shipped across the wire and unmarshalled in a remote server's Java virtual machine<a href="#31491"><sup>1</sup></a> (<span style="color: #000000; font-size: 10pt; font-style: normal; font-weight: normal; text-decoration: none; text-transform: none; vertical-align: baseline">JVM</span>).
 </p>
 <p class="Body">
-  <a name="1778"> </a>This specification describes the architecture of JavaSpaces(TM) technology, which is designed to help you solve two related problems: distributed persistence and the design of distributed algorithms. JavaSpaces services use <span style="color: #000000; font-size: 10pt; font-style: normal; font-weight: normal; text-decoration: none; text-transform: none; vertical-align: baseline">RMI</span> and the serialization feature of the Java programming language to accomplish these goals.
+  <a name="1778"> </a>This specification describes the architecture of JavaSpaces technology, which is designed to help you solve two related problems: distributed persistence and the design of distributed algorithms. JavaSpaces services use <span style="color: #000000; font-size: 10pt; font-style: normal; font-weight: normal; text-decoration: none; text-transform: none; vertical-align: baseline">RMI</span> and the serialization feature of the Java programming language to accomplish these goals.
 </p>
 <h4 class="Heading3">
   <a name="27387"> </a>JS.1.1	 The JavaSpaces Application Model and Terms
 </h4>
 <p class="Body">
-  <a name="27409"> </a>A JavaSpaces service holds <em class="Emphasis">entries</em>. An entry is a typed group of objects, expressed in a class for the Java platform that implements the interface <code>net.jini.core.entry.Entry</code>. Entries are described in detail in the <a href="entry-spec.html"><em class="Emphasis">Jini(TM) Entry Specification</em></a>. 
+  <a name="27409"> </a>A JavaSpaces service holds <em class="Emphasis">entries</em>. An entry is a typed group of objects, expressed in a class for the Java platform that implements the interface <code>net.jini.core.entry.Entry</code>. Entries are described in detail in the <a href="entry-spec.html"><em class="Emphasis">Jini Entry Specification</em></a>. 
 </p>
 <p class="Body">
   <a name="27420"> </a>An entry can be <em class="Emphasis">written</em> into a JavaSpaces service, which creates a copy of that entry in the space<a href="#27423"><sup>2</sup></a> that can be used in future lookup operations.
@@ -585,7 +585,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>JavaSpaces(TM) Service Specifications</em></td>
+<td align=right><em>JavaSpaces Service Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/lds-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/lds-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/lds-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/lds-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Lookup Discovery Service  </title>
+<title>Jini Lookup Discovery Service  </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -31,7 +31,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -795,7 +795,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/lease-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/lease-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/lease-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/lease-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Distributed Leasing Specification  </title>
+<title>Jini Distributed Leasing Specification  </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -31,7 +31,7 @@
 <table width="90%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+<td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -486,7 +486,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+<td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/leaseutil-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/leaseutil-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/leaseutil-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/leaseutil-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Lease Utilities Specification  </title>
+<title>Jini Lease Utilities Specification  </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -32,7 +32,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><i>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</i></td>
+<td align=right><i>A Collection of Jini Technology Helper Utilities and Services Specifications</i></td>
 </tr>
 </table>
 <br clear="all">
@@ -482,7 +482,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/lookup-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/lookup-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/lookup-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/lookup-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Technology Lookup Service Specification</title>
+<title>Jini Technology Lookup Service Specification</title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -32,7 +32,7 @@
 <table width="90%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-</td><td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+</td><td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -490,7 +490,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-</td><td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+</td><td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/lrs-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/lrs-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/lrs-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/lrs-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Lease Renewal Service Specification  </title>
+<title>Jini Lease Renewal Service Specification  </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -32,7 +32,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -466,7 +466,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/mailbox-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/mailbox-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/mailbox-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/mailbox-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Event Mailbox Service Specification  </title>
+<title>Jini Event Mailbox Service Specification  </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -32,7 +32,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><i>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications
+<td align=right><i>A Collection of Jini Technology Helper Utilities and Services Specifications
 </i></td>
 </tr>
 </table>
@@ -390,7 +390,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><i>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</i></td>
+<td align=right><i>A Collection of Jini Technology Helper Utilities and Services Specifications</i></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/schema-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/schema-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/schema-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/schema-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Lookup Attribute Schema Specification  </title>
+<title>Jini Lookup Attribute Schema Specification  </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -31,7 +31,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -669,7 +669,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/servicediscutil-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/servicediscutil-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/servicediscutil-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/servicediscutil-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Service Discovery Utilities Specification  </title>
+<title>Jini Service Discovery Utilities Specification  </title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -32,7 +32,7 @@
 <table width="100%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -823,7 +823,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>A Collection of Jini(TM) Technology Helper Utilities and Services Specifications</em></td>
+<td align=right><em>A Collection of Jini Technology Helper Utilities and Services Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/doc/specs/html/txn-spec.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/doc/specs/html/txn-spec.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/doc/specs/html/txn-spec.html (original)
+++ incubator/river/trunk/jtsk/doc/specs/html/txn-spec.html Tue Oct 16 14:24:25 2007
@@ -22,7 +22,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="GENERATOR" content="Quadralay WebWorks Publisher 5.0.4">
 <link rel="StyleSheet" href="standard.css" type="text/css" media="screen">
-<title>Jini(TM) Transaction Spec</title>
+<title>Jini Transaction Spec</title>
 </head>
 
 <body bgcolor="#ffffff">
@@ -31,7 +31,7 @@
 <table width="90%">
 <tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a></td>
-<td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+<td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr>
 </table>
 <br clear="all">
@@ -905,7 +905,7 @@
 <a href="#skip" title="Skip navigation bar"></a>
 <table width="100%"><tr>
 <td align=left><a href="../../spec-index.html">Spec Index</a>
-<td align=right><em>Jini(TM) Technology Core Platform Specifications</em></td>
+<td align=right><em>Jini Technology Core Platform Specifications</em></td>
 </tr></table>
 <a name="skip"></a>
 

Modified: incubator/river/trunk/jtsk/index.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/index.html?rev=585264&r1=585263&r2=585264&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/index.html (original)
+++ incubator/river/trunk/jtsk/index.html Tue Oct 16 14:24:25 2007
@@ -34,11 +34,9 @@
 <LI><B>Informative reading</B>
     <ul>
     <li><i><a href="doc/arch2_0.html">Apache River Release Overview</a></i>
-    <li><i><a href="doc/specs/html/jini-spec.html">Jini(TM) Architecture</a></i></i>
+    <li><i><a href="doc/specs/html/jini-spec.html">Jini Architecture</a></i></i>
 
 </ul> 
-<p>
-<LI><B><a href="doc/release-notes/new.html">What's new in this release</a></B>   
 <p>
 <LI><B><a href="doc/release-notes/index.html">Release Notes</a></B>
 <p>