river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fbarn...@apache.org
Subject svn commit: r585277 [1/2] - in /incubator/river/trunk/jtsk/src: com/sun/jini/collection/ com/sun/jini/constants/ com/sun/jini/discovery/ com/sun/jini/discovery/kerberos/ com/sun/jini/discovery/plaintext/ com/sun/jini/discovery/ssl/ com/sun/jini/discove...
Date Tue, 16 Oct 2007 22:32:35 GMT
Author: fbarnaby
Date: Tue Oct 16 15:32:23 2007
New Revision: 585277

URL: http://svn.apache.org/viewvc?rev=585277&view=rev
Log:
Removed "TM" references from "Jini(TM)" and "JavaSpaces(TM)" and changed additional "starter kit" references.


Modified:
    incubator/river/trunk/jtsk/src/com/sun/jini/collection/WeakTable.java
    incubator/river/trunk/jtsk/src/com/sun/jini/constants/VersionConstants.java
    incubator/river/trunk/jtsk/src/com/sun/jini/discovery/kerberos/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/discovery/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/discovery/plaintext/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/discovery/ssl/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withdsa/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withrsa/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/example/browser/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/config/logging.properties
    incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/index.html
    incubator/river/trunk/jtsk/src/com/sun/jini/fiddler/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/JoinStateManager.java
    incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerImpl.java
    incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerTransaction.java
    incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/mercury/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/norm/event/EventType.java
    incubator/river/trunk/jtsk/src/com/sun/jini/norm/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/EntryHandle.java
    incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/JoinStateManager.java
    incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/OutriggerServerImpl.java
    incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/SnapshotRep.java
    incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/Txn.java
    incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/AccessILFactory.java
    incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessILFactory.java
    incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessProxyTrustILFactory.java
    incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/reggie/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/start/SharedActivationPolicyPermission.java
    incubator/river/trunk/jtsk/src/com/sun/jini/start/package.html
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/CheckConfigurationFile.java
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassDep.java
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassServer.java
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeDigest.java
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/DebugDynamicPolicyProvider.java
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/JarWrapper.java
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/PreferredListGen.java
    incubator/river/trunk/jtsk/src/com/sun/jini/tool/envcheck/plugins/resources/checkjskpolicy.properties
    incubator/river/trunk/jtsk/src/net/jini/config/package.html
    incubator/river/trunk/jtsk/src/net/jini/core/discovery/package.html
    incubator/river/trunk/jtsk/src/net/jini/core/entry/Entry.java
    incubator/river/trunk/jtsk/src/net/jini/core/entry/package.html
    incubator/river/trunk/jtsk/src/net/jini/core/event/package.html
    incubator/river/trunk/jtsk/src/net/jini/core/lease/package.html
    incubator/river/trunk/jtsk/src/net/jini/core/lookup/package.html
    incubator/river/trunk/jtsk/src/net/jini/core/transaction/package.html
    incubator/river/trunk/jtsk/src/net/jini/core/transaction/server/package.html
    incubator/river/trunk/jtsk/src/net/jini/discovery/LookupDiscoveryManager.java
    incubator/river/trunk/jtsk/src/net/jini/discovery/package.html
    incubator/river/trunk/jtsk/src/net/jini/entry/package.html
    incubator/river/trunk/jtsk/src/net/jini/export/package.html
    incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriExporter.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriTrustVerifier.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/ProxyTrustILFactory.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ConnectionManager.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ServerConnectionManager.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/connection/doc-files/mux.html
    incubator/river/trunk/jtsk/src/net/jini/jeri/connection/package.html
    incubator/river/trunk/jtsk/src/net/jini/jeri/kerberos/KerberosEndpoint.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/kerberos/KerberosServerEndpoint.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/kerberos/KerberosTrustVerifier.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/kerberos/package.html
    incubator/river/trunk/jtsk/src/net/jini/jeri/package.html
    incubator/river/trunk/jtsk/src/net/jini/jeri/ssl/SslEndpoint.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/ssl/SslServerEndpoint.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/ssl/package.html
    incubator/river/trunk/jtsk/src/net/jini/jeri/tcp/TcpEndpoint.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/tcp/TcpServerEndpoint.java
    incubator/river/trunk/jtsk/src/net/jini/jeri/tcp/package.html
    incubator/river/trunk/jtsk/src/net/jini/lease/LeaseRenewalSet.java
    incubator/river/trunk/jtsk/src/net/jini/lease/package.html
    incubator/river/trunk/jtsk/src/net/jini/lookup/ServiceDiscoveryManager.java
    incubator/river/trunk/jtsk/src/net/jini/lookup/entry/EntryBeans.java
    incubator/river/trunk/jtsk/src/net/jini/lookup/entry/package.html
    incubator/river/trunk/jtsk/src/net/jini/lookup/package.html
    incubator/river/trunk/jtsk/src/net/jini/security/package.html
    incubator/river/trunk/jtsk/src/net/jini/security/proxytrust/package.html
    incubator/river/trunk/jtsk/src/net/jini/space/AvailabilityEvent.java
    incubator/river/trunk/jtsk/src/net/jini/space/JavaSpace.java
    incubator/river/trunk/jtsk/src/net/jini/space/JavaSpace05.java
    incubator/river/trunk/jtsk/src/net/jini/space/MatchSet.java
    incubator/river/trunk/jtsk/src/net/jini/space/package.html
    incubator/river/trunk/jtsk/src/net/jini/space/package.spec.html

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/collection/WeakTable.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/collection/WeakTable.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/collection/WeakTable.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/collection/WeakTable.java Tue Oct 16 15:32:23 2007
@@ -27,7 +27,7 @@
  * objects.  For example, it can be used for smart proxy objects that
  * maintain equality for references to the same remote server.  If a
  * single VM twice invokes a remote method that returns a proxy for the
- * same JavaSpaces(TM) server, the references returned by that method 
+ * same JavaSpaces server, the references returned by that method 
  * should be the same.  This allows <code>==</code> tests to work for 
  * proxies to remote servers the same as they would for direct references 
  * to remote servers, which also maintain this property.

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/constants/VersionConstants.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/constants/VersionConstants.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/constants/VersionConstants.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/constants/VersionConstants.java Tue Oct 16 15:32:23 2007
@@ -24,6 +24,6 @@
  *
  */
 public interface VersionConstants {
-    /** Current version of the Jini(tm) Software Kit (JSK) */ 
+    /** Current version of the Apache River release */ 
     String SERVER_VERSION = "2.1.1";
 }

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/discovery/kerberos/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/discovery/kerberos/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/discovery/kerberos/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/discovery/kerberos/package.html Tue Oct 16 15:32:23 2007
@@ -24,7 +24,7 @@
 <body bgcolor="white">
 
 Provides an implementation of the <code>net.jini.discovery.kerberos</code>
-discovery format, specified in the <i>Jini(TM) Discovery and Join
+discovery format, specified in the <i>Jini Discovery and Join
 Specification</i>.  The {@link com.sun.jini.discovery.kerberos.Client} class
 implements the client side of the <code>net.jini.discovery.kerberos</code>
 discovery format for the unicast discovery protocol, while the {@link
@@ -37,7 +37,7 @@
 
 <h2>Supported Constraints</h2>
 
-This provider supports the same constraints as the Jini(TM) extensible remote
+This provider supports the same constraints as the Jini extensible remote
 invocation (Jini ERI) Kerberos transport provider; these constraints are listed
 in the documentation for the {@link net.jini.jeri.kerberos} package.
 
@@ -48,7 +48,7 @@
 for the {@link net.jini.jeri.kerberos} package.
 
 @since 2.0
-@see "<i>Jini(TM) Discovery and Join Specification</i>"
+@see "<i>Jini Discovery and Join Specification</i>"
 
 </body>
 </html>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/discovery/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/discovery/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/discovery/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/discovery/package.html Tue Oct 16 15:32:23 2007
@@ -55,7 +55,7 @@
 {@link com.sun.jini.discovery.UnicastDiscoveryServer} format provider
 sub-interfaces.
 
-@see "<i>Jini(TM) Discovery and Join Specification</i>"
+@see "<i>Jini Discovery and Join Specification</i>"
 
 </body>
 </html>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/discovery/plaintext/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/discovery/plaintext/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/discovery/plaintext/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/discovery/plaintext/package.html Tue Oct 16 15:32:23 2007
@@ -24,7 +24,7 @@
 <body bgcolor="white">
 
 Provides an implementation of the <code>net.jini.discovery.plaintext</code>
-discovery format, specified in the <i>Jini(TM) Discovery and Join
+discovery format, specified in the <i>Jini Discovery and Join
 Specification</i>.  The {@link com.sun.jini.discovery.plaintext.Client} class
 implements the client side of the <code>net.jini.discovery.plaintext</code>
 discovery format for the multicast request, multicast announcement, and unicast
@@ -71,7 +71,7 @@
 are not supported.)
 
 @since 2.0
-@see "<i>Jini(TM) Discovery and Join Specification</i>"
+@see "<i>Jini Discovery and Join Specification</i>"
 
 </body>
 </html>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/discovery/ssl/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/discovery/ssl/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/discovery/ssl/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/discovery/ssl/package.html Tue Oct 16 15:32:23 2007
@@ -24,7 +24,7 @@
 <body bgcolor="white">
 
 Provides an implementation of the <code>net.jini.discovery.ssl</code> discovery
-format, specified in the <i>Jini(TM) Discovery and Join Specification</i>.  The
+format, specified in the <i>Jini Discovery and Join Specification</i>.  The
 {@link com.sun.jini.discovery.ssl.Client} class implements the client side of
 the <code>net.jini.discovery.ssl</code> discovery format for the unicast
 discovery protocol, while the {@link com.sun.jini.discovery.ssl.Server} class
@@ -36,7 +36,7 @@
 
 <h2>Supported Constraints</h2>
 
-This provider supports the same constraints as the Jini(TM) extensible remote
+This provider supports the same constraints as the Jini extensible remote
 invocation (Jini ERI) SSL transport provider; these constraints are listed in
 the documentation for the {@link net.jini.jeri.ssl} package.
 
@@ -47,7 +47,7 @@
 the {@link net.jini.jeri.ssl} package.
 
 @since 2.0
-@see "<i>Jini(TM) Discovery and Join Specification</i>"
+@see "<i>Jini Discovery and Join Specification</i>"
 
 </body>
 </html>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withdsa/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withdsa/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withdsa/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withdsa/package.html Tue Oct 16 15:32:23 2007
@@ -25,7 +25,7 @@
 
 Provides an implementation of the
 <code>net.jini.discovery.x500.SHA1withDSA</code> discovery format, specified in
-the <i>Jini(TM) Discovery and Join Specification</i>.  The {@link
+the <i>Jini Discovery and Join Specification</i>.  The {@link
 com.sun.jini.discovery.x500.sha1withdsa.Client} class implements the client
 side of the <code>net.jini.discovery.x500.SHA1withDSA</code> discovery format
 for the multicast request and multicast announcement discovery protocols, while
@@ -186,7 +186,7 @@
 </table>
 
 @since 2.0
-@see "<i>Jini(TM) Discovery and Join Specification</i>"
+@see "<i>Jini Discovery and Join Specification</i>"
 
 </body>
 </html>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withrsa/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withrsa/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withrsa/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/discovery/x500/sha1withrsa/package.html Tue Oct 16 15:32:23 2007
@@ -25,7 +25,7 @@
 
 Provides an implementation of the
 <code>net.jini.discovery.x500.SHA1withRSA</code> discovery format, specified in
-the <i>Jini(TM) Discovery and Join Specification</i>.  The {@link
+the <i>Jini Discovery and Join Specification</i>.  The {@link
 com.sun.jini.discovery.x500.sha1withrsa.Client} class implements the client
 side of the <code>net.jini.discovery.x500.SHA1withRSA</code> discovery format
 for the multicast request and multicast announcement discovery protocols, while
@@ -186,7 +186,7 @@
 </table>
 
 @since 2.0
-@see "<i>Jini(TM) Discovery and Join Specification</i>"
+@see "<i>Jini Discovery and Join Specification</i>"
 
 </body>
 </html>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/example/browser/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/example/browser/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/example/browser/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/example/browser/package.html Tue Oct 16 15:32:23 2007
@@ -24,12 +24,12 @@
 </head>
 <body text="#000000" bgcolor="#ffffff" link="#9b37cc"
       vlink="#cc1877" alink="#ffffff">
-A visualization tool for exploring Jini(TM) Network Technology
+A visualization tool for exploring Jini Network Technology
 communities (<i>djinns</i>). The Service Browser
 lets you discover lookup services and inspect the various
 services registered within those lookup services. This tool
-is provided as an example program within the Jini Technology Starter Kit
-(starter kit) but many who use it think
+is provided as an example program within the Apache River release
+but many who use it think
 of it more as a utility than an example.
 <p>
 This document provides the following information about the Service Browser:
@@ -55,7 +55,7 @@
 </pre></blockquote>
 where <var><b>java_options</b></var> includes such things as the security
 policy file and the RMI codebase annotation, <var><b>install_dir</b></var>
-is the directory where the starter kit is installed, and
+is the directory where the Apache River release is installed, and
 <var><b>config_options</b></var> includes any
 {@link net.jini.config.Configuration} provider options. The
 Service Browser can be run with no <var><b>config_options</b></var>.
@@ -250,7 +250,7 @@
 Browser, selecting <b>Admin Service</b> from this menu brings up the
 <b>ServiceItem Editor</b> window. Selecting <b>Browse Service</b> from
 this menu brings up the <b>ServiceItem Browser</b> window. If the service
-is a JavaSpaces(TM) service and either its proxy implements the
+is a JavaSpaces service and either its proxy implements the
 {@link net.jini.space.JavaSpace05} interface or its administrative proxy
 implements the {@link com.sun.jini.outrigger.JavaSpaceAdmin}
 interface, selecting <b>Browse Entries</b> from this menu brings up a
@@ -666,7 +666,7 @@
 <var><b>your_host</b></var>, running an HTTP server on port
 <var><b>http_port</b></var>, serving files in the <code>lib</code>
 subdirectory of <var><b>install_dir</b></var>, the directory where the
-starter kit is installed.
+Apache River release is installed.
 When the Service Browser is run this way, without a configuration file, it
 will perform multicast discovery to find all available lookup
 services, and will use Jini extensible remote invocation (Jini ERI)

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/config/logging.properties
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/config/logging.properties?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/config/logging.properties (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/config/logging.properties Tue Oct 16 15:32:23 2007
@@ -1,5 +1,5 @@
 # This file is used to configure the Java logging facility
-# Many of the Jini(TM) Technology classes support logging.
+# Many of the Jini Technology classes support logging.
 
 handlers= java.util.logging.ConsoleHandler
 .level= INFO

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/index.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/index.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/index.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/example/hello/index.html Tue Oct 16 15:32:23 2007
@@ -27,11 +27,11 @@
 
 <h2>Introduction</h2>
 <p>
-The Hello example was created to illustrate how a typical Jini(TM) 
+The Hello example was created to illustrate how a typical Jini 
 technology-based application can be configured and optionally secured
 using the configuration and Jini extensible remote invocation (Jini ERI) 
 facilities that arrived in version 2.0 of the Jini Technology Starter Kit 
-(starter kit). The components built from the files making up this example 
+. The components built from the files making up this example 
 are a <i>server</i> component that implements a <code>Hello</code> 
 interface with a <code>sayHello()</code> method, and a <i>client</i> 
 component that employs a <i>lookup service</i> to obtain a reference to 
@@ -136,7 +136,7 @@
 <a href="../../../../../../../doc/specs/api/net/jini/security/policy/DynamicPolicyProvider.html">dynamic permission granting</a>
 features of the 
 <a href="../../../../../../../doc/specs/api/net/jini/security/policy/package-summary.html">security policy provider</a>
-included in the starter kit. 
+included in the Apache River release. 
 
 <h4>SSL setup</h4>
 
@@ -226,22 +226,22 @@
 <a href="../../../../../../../doc/specs/api/net/jini/security/policy/DynamicPolicyProvider.html">dynamic permission granting</a>,
 the 
 <a href="../../../../../../../doc/specs/api/net/jini/security/policy/package-summary.html">security policy provider</a>
-included in the starter kit must be installed as an extension 
+included in the Apache River release must be installed as an extension 
 in the Java 2 SDK (or JRE) used to run this example. Although the
 <a href="../../../../../../../doc/info-index.html#install">top level documentation</a>
-of the starter kit discusses two different strategies for installing 
+of the Apache River release discusses two different strategies for installing 
 the policy provider, the strategy that this example <b>requires</b> 
 is the strategy in which the JAR file <code>jsk-policy.jar</code> 
 is copied into the Java extensions directory; specifically:
 <p>
 <ol>
   <li>Locate the <code>jsk-policy.jar</code> file in the
-      <code>lib-ext</code> directory of the starter kit.
+      <code>lib-ext</code> directory of the Apache River release.
   </li>
   <li>Locate the <code>jre/lib/ext</code> directory inside your
       Java 2 SDK (or JRE) distribution.
   </li>
-  <li>Copy the <code>jsk-policy.jar</code> file from the starter kit
+  <li>Copy the <code>jsk-policy.jar</code> file from the Apache River release
       to the <code>jre/lib/ext</code> directory as located in step 2.
   </li>
 </ol>
@@ -249,7 +249,7 @@
 After following the steps outlined above, if the virtual machine 
 for the Java platform associated with the <code>ext</code> directory 
 is available in your path, then the features provided by the security 
-policy provider included in the starter kit will be available when 
+policy provider included in the Apache River release will be available when 
 running the example.
 <p>
 <hr>
@@ -316,10 +316,10 @@
 
 To run this example under any of the possible configurations, a single 
 class server should be started to serve up files from both the example's
-<code>lib</code> directory and the starter kit's <code>lib-dl</code>
+<code>lib</code> directory and the Apache River release <code>lib-dl</code>
 directory. The 
 <a href="../../../../../../../doc/api/com/sun/jini/tool/ClassServer.html">class server</a>
-provided in the starter kit is used for this purpose. Note that once 
+provided in the Apache River release is used for this purpose. Note that once 
 started, there is no need to shut down the class server (cntrl-c) until 
 it is no longer needed. This is because that single class server can be 
 shared by each configuration. To start the class server, type the 
@@ -1050,8 +1050,8 @@
 
 <h4>Dynamic permissions, integrity, access control</h4>
 
-To install the security policy provider included in the starter
-kit (to enable dynamic permission granting) the secure configurations
+To install the security policy provider included in the Apache River 
+release (to enable dynamic permission granting) the secure configurations
 of the lookup service, the server, and Phoenix each use the 
 security properties file, 
 <code><a href="config/dynamic-policy.security-properties">config/dynamic-policy.security-properties</a></code>.
@@ -1467,7 +1467,7 @@
 Another common strategy is to provide a separate registration 
 mechanism (for example, the class
 <a href="../../../../../../../doc/api/com/sun/jini/start/SharedActivatableServiceDescriptor.html"><code>SharedActivatableServiceDescriptor</code></a>
-from the starter kit's
+from the Apache River release's
 <a href="../../../../../../../doc/api/com/sun/jini/start/package-summary.html"><i>service starter framework</i></a>).
 <p>
 As with the confirming configurations, the activatable configurations 
@@ -1767,7 +1767,7 @@
 trust will not supply a JDK or JRE that does "bad things". Even if 
 the version of Java you are using was not installed by you, it was 
 probably pre-installed by the (trusted) vendor who supplied your
-system. Similarly, the starter kit itself was obtained from a 
+system. Similarly, the Apache River release itself was obtained from a 
 trusted source (the Jini team), and was installed by someone you must 
 certainly trust - you! Code that is installed and runs locally (including 
 your own application code) can be safely granted "all permissions" 
@@ -1782,15 +1782,15 @@
 from the <a href="#all-policy-files">lists below</a>. In both files, 
 you will see that "all permissions" is granted to the JAR files from only
 the <a href="../../../../../../../lib"><code>lib</code></a> directory
-of the starter kit, with no entries granting "all permissions" to  
+of the Apache River release, with no entries granting "all permissions" to  
 <code>http: URL</code>s referencing any of the JAR files from the 
 <a href="../../../../../../../lib-dl"><code>lib-dl</code></a> directory.
 Recall that files such as <code>jsk-platform.jar</code>, 
-<code>reggie.jar</code>, etc. are contained in the starter kit's 
+<code>reggie.jar</code>, etc. are contained in the Apache River release's 
 <code>lib</code> directory whereas only <i>downloadable</i> JAR 
 files (such as <code>jsk-dl.jar</code>, <code>reggie-dl.jar</code>, etc.) 
 are contained in the <code>lib-dl</code> directory. The pattern
-promoted by the starter kit is that the JAR files from the 
+promoted by the Apache River release is that the JAR files from the 
 <code>lib</code> directory are expected to be locally installed, 
 not downloaded; whereas the JAR files contained in the <code>lib-dl</code> 
 directory are expected to be downloaded. Thus, another way of stating 
@@ -2194,7 +2194,7 @@
 This example does not specify any of its own 
 <a href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/logging/Logger.html">loggers</a>.
 All logging that occurs in this example occurs through the various 
-loggers specified in the starter kit itself, which are configured
+loggers specified in the Apache River release itself, which are configured
 using the following 
 <a href="http://java.sun.com/j2se/1.4.2/docs/guide/util/logging/overview.html#1.8">logger configuration file</a>:
 

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/fiddler/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/fiddler/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/fiddler/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/fiddler/package.html Tue Oct 16 15:32:23 2007
@@ -1248,7 +1248,7 @@
 <ul> <li> The examples are being run on UNIX platforms.
      <li> The Java(TM) 2 Platform, Standard Edition, has been installed
           in the directory <b><i>java_install_dir</i></b>
-     <li> The Jini(TM) Technology Starter Kit (starter kit) has been
+     <li> The Apache River release has been
           installed in the directory <b><i>jini_install_dir</i></b>
      <li> The example configuration and policy files described below are
           available in the directories <b><i>example_install_dir/config</i></b>
@@ -1271,7 +1271,7 @@
           with the path to the 1.4 version (or above) of the Java 2 
           Platform installed on your system.
      <li> Replace all occurrences of <b><i>jini_install_dir</i></b>
-          with the path to the desired version of the starter kit.
+          with the path to the desired version of the Apache River release.
      <li> Replace all occurrences of <b><i>example_install_dir/config</i></b>
           and <b><i>example_install_dir/policy</i></b> with the appropriate
           path to the example configuration and policy files.
@@ -1305,8 +1305,8 @@
 That is, once started, the HTTP server does <b><i>not</i></b> need to be 
 stopped and restarted for each mode in which the service runs.
 <p>
-If you choose to use the HTTP server supplied with the starter
-kit, then the following command will start that daemon in <i>verbose</i>
+If you choose to use the HTTP server supplied with the Apache River
+release, then the following command will start that daemon in <i>verbose</i>
 mode, listening for requests on port <code>8080</code>, and serving files 
 from the root directory, <b><i>jini_install_dir/lib-dl</i></b>:
 
@@ -1344,7 +1344,7 @@
 boundless. The flexibility inherent in the configuration mechanism allows 
 Fiddler not only to be configured to employ any <i>existing</i> remote 
 communication framework and transport, but also any <i>future</i> framework 
-or transport that may be defined. The current release of the starter kit 
+or transport that may be defined. The current release of Apache River
 provides implementations for the following remote communication frameworks 
 and transports:
 <ul><li>JRMP over TCP/IP
@@ -1367,17 +1367,17 @@
 </ul>
 For detailed examples of the other combinations, see the
 <a href="../../../../../../source/src/com/sun/jini/example/hello/index.html">hello example</a>
-supplied with the starter kit.
+supplied with the Apache River release.
 <p>
 
 <a name="activation">
 <h3>Activation</h3>
 In order to run the activatable mode of this service, an activation
 system must be running on the same host as the service. For previous
-releases of the starter kit, RMID was used for this purpose. Although RMID 
+releases, RMID was used for this purpose. Although RMID 
 may still be used under certain circumstances, it is recommended that the 
 <a href="../../../../com/sun/jini/phoenix/package-summary.html"><code>com.sun.jini.phoenix</code></a>
-implementation supplied with the starter kit now be used for all 
+implementation supplied with the Apache River release now be used for all 
 activatable configurations of the service.
 <p>
 For the two activatable examples below, command lines for starting
@@ -1771,7 +1771,7 @@
 (<i>Java RMI</i>) provides for <i>persistent references</i>; that is,
 remote references that remain valid after the service has crashed and been
 restarted. For more details, see the <a href="../../../../../release-notes/activation.html" 
-title="Note on RMI Activation and How it is Used in the Starter Kit">
+title="Note on RMI Activation and How it is Used in the Apache River release">
 <code>"Note on RMI Activation"</code></a>.
 <p>
 Finally, recall that a primary purpose for persisting state is so that the service 
@@ -1923,7 +1923,7 @@
 In order to run Fiddler in any of the activatable configurations, an
 activation system must be running on the same host as Fiddler. Phoenix
 is the name of the implementation of the activation system provided with 
-the starter kit. Because Phoenix is configurable and supports the desired 
+the Apache River release. Because Phoenix is configurable and supports the desired 
 communication mechanisms, that implementation is presented with the
 activatable configurations of Fiddler that follow. (For more information
 and examples on Phoenix, refer to the Phoenix documentation 

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/JoinStateManager.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/JoinStateManager.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/JoinStateManager.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/JoinStateManager.java Tue Oct 16 15:32:23 2007
@@ -83,7 +83,7 @@
 
     /**
      * <code>JoinManager</code> that is handling the details of binding
-     * into Jini(TM) lookup services.
+     * into Jini lookup services.
      */
     private JoinManager  mgr;
 

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerImpl.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerImpl.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerImpl.java Tue Oct 16 15:32:23 2007
@@ -93,7 +93,7 @@
 import net.jini.security.TrustVerifier;
 
 /**
- * An implementation of the Jini(TM) Transaction Specification.
+ * An implementation of the Jini Transaction Specification.
  *
  * @author Sun Microsystems, Inc.
  *

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerTransaction.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerTransaction.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerTransaction.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/TxnManagerTransaction.java Tue Oct 16 15:32:23 2007
@@ -72,7 +72,7 @@
     * TransactionManager may make.
     *
     * This represents the following diagram from the
-    * Jini(TM) Transaction Spec:
+    * Jini Transaction Spec:
     *
     *  ACTIVE ----> VOTING ------->COMMITTED
     *     \           |

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/mahalo/package.html Tue Oct 16 15:32:23 2007
@@ -43,7 +43,7 @@
 
 <p>
 The JAR file <code>mahalo.jar</code>, included in the <code>lib</code>
-subdirectory of the Jini(TM) Technology Starter Kit (starter kit)
+subdirectory of the Apache River release
 installation, contains the classes for the three Mahalo service
 implementations. The <code>mahalo-dl.jar</code> 
 and <code>jsk-dl.jar</code> files in the <code>lib-dl</code> subdirectory
@@ -797,7 +797,7 @@
      <li> <a href="#persistent_jrmp">Persistent</a>
      <li> <a href="#activatable_jrmp">Activatable</a>
      </ul>
-<li> Jini(TM) extensible remote invocation (Jini ERI) configurations
+<li> Jini extensible remote invocation (Jini ERI) configurations
      <ul>
      <li> <a href="#transient">Transient</a>
      <li> <a href="#persistent">Persistent</a>
@@ -815,7 +815,7 @@
 <ul>
 <li> The Java(TM) 2 Platform, Standard Edition, (J2SE(TM)) has been
      installed, and its commands are available in the current path
-<li> The starter kit has been installed in the
+<li> The Apache River release has been installed in the
      <var><b>install_dir</b></var> directory
 <li> The example configuration and policy files described below are
      available in the <var><b>config_dir</b></var> directory
@@ -865,7 +865,7 @@
 
 Use this security policy file for starting and running all Mahalo
 configurations. This file grants all permissions to local code included
-in the <code>lib</code> subdirectory of the starter kit installation.<p>
+in the <code>lib</code> subdirectory of the Apache River release installation.<p>
 
 <blockquote>
 <pre>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/mercury/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/mercury/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/mercury/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/mercury/package.html Tue Oct 16 15:32:23 2007
@@ -43,7 +43,7 @@
 
 <p>
 The JAR file <code>mercury.jar</code>, included in the <code>lib</code>
-subdirectory of the Jini(TM) Technology Starter Kit (starter kit)
+subdirectory of the Apache River release
 installation, contains the classes for the three Mercury service
 implementations. The <code>mercury-dl.jar</code> 
 and <code>jsk-dl.jar</code> files in the <code>lib-dl</code> subdirectory
@@ -808,7 +808,7 @@
      <li> <a href="#persistent_jrmp">Persistent</a>
      <li> <a href="#activatable_jrmp">Activatable</a>
      </ul>
-<li> Jini(TM) extensible remote invocation (Jini ERI) configurations
+<li> Jini extensible remote invocation (Jini ERI) configurations
      <ul>
      <li> <a href="#transient">Transient</a>
      <li> <a href="#persistent">Persistent</a>
@@ -826,7 +826,7 @@
 <ul>
 <li> The Java(TM) 2 Platform, Standard Edition, (J2SE(TM)) has been
      installed, and its commands are available in the current path
-<li> The starter kit has been installed in the
+<li> The Apache River release has been installed in the
      <var><b>install_dir</b></var> directory
 <li> The example configuration and policy files described below are
      available in the <var><b>config_dir</b></var> directory
@@ -876,7 +876,7 @@
 
 Use this security policy file for starting and running all Mercury
 configurations. This file grants all permissions to local code included
-in the <code>lib</code> subdirectory of the starter kit installation.<p>
+in the <code>lib</code> subdirectory of the Apache River release installation.<p>
 
 <blockquote>
 <pre>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/norm/event/EventType.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/norm/event/EventType.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/norm/event/EventType.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/norm/event/EventType.java Tue Oct 16 15:32:23 2007
@@ -317,7 +317,7 @@
 
 	// Even if there is no listener, an event has occurred, so
 	// increment the sequence number (note this a stronger
-	// guarantee that the Jini(TM) Distributed Event Specification,
+	// guarantee that the Jini Distributed Event Specification,
 	// but one that is required by the LRS spec).
 	lastSeqNum++;
 

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/norm/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/norm/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/norm/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/norm/package.html Tue Oct 16 15:32:23 2007
@@ -45,7 +45,7 @@
 </ul> <p>
 
 The JAR file <code>norm.jar</code>, included in the <code>lib</code>
-subdirectory of the Jini(TM) Technology Starter Kit (starter kit) installation,
+subdirectory of the Apache River release installation,
 contains the classes for the three Norm service implementations. The
 <code>norm-dl.jar</code> and <code>jsk-dl.jar</code> files in the
 <code>lib-dl</code> subdirectory contain the classes needed in the codebase for
@@ -806,7 +806,7 @@
      <li> <a href="#persistent_jrmp">Persistent</a>
      <li> <a href="#activatable_jrmp">Activatable</a>
      </ul>
-<li> Jini(TM) extensible remote invocation (Jini ERI) configurations
+<li> Jini extensible remote invocation (Jini ERI) configurations
      <ul>
      <li> <a href="#transient">Transient</a>
      <li> <a href="#persistent">Persistent</a>
@@ -824,7 +824,7 @@
 <ul>
 <li> The Java(TM) 2 Platform, Standard Edition, (J2SE(TM)) has been
      installed, and its commands are available in the current path
-<li> The starter kit has been installed in the
+<li> The Apache River release has been installed in the
      <var><b>install_dir</b></var> directory
 <li> The example configuration and policy files described below are
      available in the <var><b>config_dir</b></var> directory
@@ -872,7 +872,7 @@
 
 Use this security policy file for starting and running all Norm
 configurations. This file grants all permissions to local code included
-in the <code>lib</code> subdirectory of the starter kit installation.<p>
+in the <code>lib</code> subdirectory of the Apache River release installation.<p>
 
 <blockquote>
 <pre>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/EntryHandle.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/EntryHandle.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/EntryHandle.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/EntryHandle.java Tue Oct 16 15:32:23 2007
@@ -102,7 +102,7 @@
  * @author Sun Microsystems, Inc.  
  */
 // We do not store this data on the EntryRep object itself because it
-// is not really part of the client<->JavaSpaces(TM) service protocol -- 
+// is not really part of the client<->JavaSpaces service protocol -- 
 // some implementations of EntryHolder may not choose to use this
 // mechanism.  It does add an extra object per EntryRep object in
 // those that *do* use it, and so we may want to re-examine this in the

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/JoinStateManager.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/JoinStateManager.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/JoinStateManager.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/JoinStateManager.java Tue Oct 16 15:32:23 2007
@@ -64,7 +64,7 @@
 
     /**
      * <code>JoinManager</code> that is handling the details of binding
-     * into Jini(TM) lookup services.
+     * into Jini lookup services.
      */
     private JoinManager  mgr;
 

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/OutriggerServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/OutriggerServerImpl.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/OutriggerServerImpl.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/OutriggerServerImpl.java Tue Oct 16 15:32:23 2007
@@ -386,7 +386,7 @@
      * numbers (when compared to the previous invocation) will appear
      * to have a [large] gap.
      * <p>
-     * [See the JavaSpaces(TM) Service Specification for detail on "fully
+     * [See the JavaSpaces Service Specification for detail on "fully
      *  ordered".]
      */
     private long sessionId = 0;

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/SnapshotRep.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/SnapshotRep.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/SnapshotRep.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/SnapshotRep.java Tue Oct 16 15:32:23 2007
@@ -22,7 +22,7 @@
 
 /**
  * This class is used by the <code>snapshot</code> implementation of the
- * proxy to create a <code>snapshot</code>.  Here's what the JavaSpaces(tm)
+ * proxy to create a <code>snapshot</code>.  Here's what the JavaSpaces
  * specification says about <code>snapshot</code>.
  *
  * The process of serializing an entry for transmission to a JavaSpaces

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/Txn.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/Txn.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/Txn.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/Txn.java Tue Oct 16 15:32:23 2007
@@ -41,7 +41,7 @@
 /**
  * This class represents a space's state in a single transaction.
  *
- * Object of this class represent Jini(TM) transactions within outrigger.
+ * Object of this class represent Jini transactions within outrigger.
  * These transactions hold "Transactables" -- things that represent
  * the actions that have been taken under this transaction. For example, 
  * if this transaction were to be cancelled, the Transactables are

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/outrigger/package.html Tue Oct 16 15:32:23 2007
@@ -19,7 +19,7 @@
 <HTML>
 <BODY BGCOLOR="white">
 
-This is an implementation of a JavaSpaces(TM) technology-enabled service.
+This is an implementation of a JavaSpaces technology-enabled service.
 In addition to implementing the basic {@link net.jini.space.JavaSpace}
 interface, it all implements the {@link net.jini.space.JavaSpace05}
 extension. <p>
@@ -62,7 +62,7 @@
 incompatible.<p>
 
 The JAR file <code>outrigger.jar</code>, included in the <code>lib</code>
-subdirectory of the Jini(TM) Technology Starter Kit (starter kit)
+subdirectory of the Apache River release
 installation, contains the classes for <code>TransientOutriggerImpl</code>.
 &nbsp <code>outrigger.jar</code> also includes, via a JAR file manifest
 classpath directive, a reference to
@@ -85,7 +85,7 @@
 
 None of the JAR files discussed in the previous paragraphs include classes
 from <code>jsk-platform.jar</code>. On the server side service starter, the
-starter kit's service launcher utility, ensures that
+service launcher utility, ensures that
 <code>jsk-platform.jar</code> is available to Outrigger. On the client it
 is the responsibility of the client to make <code>jsk-platform.jar</code>
 available. Typically this is done by including
@@ -138,7 +138,7 @@
 Each of these, except for <code>persistenceDirectory</code> and
 <code>store</code>, has reasonable defaults.<p>
 
-Deployments that want to use a Java RMI implementation other than Jini(TM)
+Deployments that want to use a Java RMI implementation other than Jini
 extensible remote invocation (Jini ERI) over TCP/IP on a random port will
 need to provide a value for the <a href="#serverExporter">
 <code>serverExporter</code></a> configuration entry. Deployments that use
@@ -1406,7 +1406,7 @@
 <ul>
 <li> The Java(TM) 2 Platform, Standard Edition, (J2SE(TM)) has been
      installed, and its commands are available in the current path
-<li> The starter kit has been installed in the
+<li> The Apache River release has been installed in the
      <var><b>install_dir</b></var> directory
 <li> The example configuration and policy files described below are
      available in the <var><b>config_dir</b></var> directory
@@ -1772,8 +1772,8 @@
 </a>
 
 This configuration starts a transient Outrigger server that will use Jini
-ERI (the configurable Java RMI implementation included with the starter
-kit) to communicate between proxies and the server. Only a single VM will
+ERI (the configurable Java RMI implementation included with the Apache River 
+release) to communicate between proxies and the server. Only a single VM will
 be involved (which will be started by the command shown below). The
 Outrigger server will reside in this VM. When this VM exits, the server, the
 space it is hosting, and all entries in the space will be gone. This (or a

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/AccessILFactory.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/AccessILFactory.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/AccessILFactory.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/AccessILFactory.java Tue Oct 16 15:32:23 2007
@@ -31,7 +31,7 @@
 /**
  * A basic invocation layer factory, used in exporting an
  * <code>ActivationMonitor</code> or <code>ActivationInstantiator</code> to
- * use Jini(TM) extensible remote invocation (Jini ERI), that is similar to
+ * use Jini extensible remote invocation (Jini ERI), that is similar to
  * {@link BasicILFactory} except the returned invocation dispatcher only
  * accepts calls from the local host.
  *

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessILFactory.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessILFactory.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessILFactory.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessILFactory.java Tue Oct 16 15:32:23 2007
@@ -33,7 +33,7 @@
 
 /**
  * Invocation layer factory for exporting an {@link ActivationSystem}
- * to use Jini(TM) extensible remote invocation (Jini ERI), that is similar
+ * to use Jini extensible remote invocation (Jini ERI), that is similar
  * to {@link BasicILFactory} except the remote object must be an
  * <code>ActivationSystem</code> instance and the returned dispatcher
  * optionally accepts calls from the local host and optionally enforces a

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessProxyTrustILFactory.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessProxyTrustILFactory.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessProxyTrustILFactory.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/SystemAccessProxyTrustILFactory.java Tue Oct 16 15:32:23 2007
@@ -30,7 +30,7 @@
 
 /**
  * Invocation layer factory for exporting an {@link ActivationSystem}
- * to use Jini(TM) extensible remote invocation (Jini ERI), that is similar
+ * to use Jini extensible remote invocation (Jini ERI), that is similar
  * to {@link ProxyTrustILFactory} except the remote object must be an
  * <code>ActivationSystem</code> instance and the returned dispatcher
  * optionally accepts calls from the local host and optionally enforces a

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/phoenix/package.html Tue Oct 16 15:32:23 2007
@@ -47,7 +47,7 @@
 </pre>
 
 where <i>options</i> are standard options for the <code>java</code>
-command, <var><b>install_dir</b></var> is the directory where the starter kit
+command, <var><b>install_dir</b></var> is the directory where the Apache River release
 is installed, and <i>configOptions</i> are the options (typically starting
 with a filename or URL) of a <a href="#phoenixConfig">Phoenix
 configuration</a>.
@@ -79,7 +79,7 @@
 
 where <i>codebase</i> is the codebase path, <i>policy</i> is the name
 of the security policy file,
-<var><b>install_dir</b></var> is the directory where the starter kit
+<var><b>install_dir</b></var> is the directory where the Apache River release
 is installed,
 <var><b>install_dir</b></var><code>/lib/phoenix.jar</code> is the class path for
 Phoenix, <code>com.sun.jini.phoenix.PhoenixStarter</code> is the class
@@ -393,7 +393,7 @@
 using the registry well-known object identifier. To support persistent
 references, the exporters for the activator and the activation system must
 produce proxies that are reusable across restarts of Phoenix. For JRMP and
-Jini(TM) extensible remote invocation (Jini ERI), this means using fixed object
+Jini extensible remote invocation (Jini ERI), this means using fixed object
 identifiers and fixed ports.
 <p>
 If the activator supports constraints (meaning the activator proxy implements

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/reggie/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/reggie/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/reggie/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/reggie/package.html Tue Oct 16 15:32:23 2007
@@ -44,7 +44,7 @@
 
 The name "Reggie" loosely refers to either implementation.  The JAR file
 <code>reggie.jar</code>, included in the <code>lib</code> subdirectory of the
-Jini(TM) Technology Starter Kit (starter kit) installation, contains the
+Apache River release installation, contains the
 classes for both Reggie service implementations. The <code>reggie-dl.jar</code>
 and <code>jsk-dl.jar</code> files in the <code>lib-dl</code> subdirectory 
 contain the classes needed in the codebase for its downloaded proxies. 
@@ -1150,7 +1150,7 @@
      <li> <a href="#persistent_jrmp">Persistent</a>
      <li> <a href="#activatable_jrmp">Activatable</a>
      </ul>
-<li> Jini(TM) extensible remote invocation (Jini ERI) configurations
+<li> Jini extensible remote invocation (Jini ERI) configurations
      <ul>
      <li> <a href="#transient">Transient</a>
      <li> <a href="#persistent">Persistent</a>
@@ -1168,7 +1168,7 @@
 <ul>
 <li> The Java(TM) 2 Platform, Standard Edition, (J2SE(TM)) has been
      installed, and its commands are available in the current path
-<li> The starter kit has been installed in the
+<li> The Apache River release has been installed in the
      <var><b>install_dir</b></var> directory
 <li> The example configuration and policy files described below are
      available in the <var><b>config_dir</b></var> directory
@@ -1261,7 +1261,7 @@
 
 Use this security policy file for starting and running all Reggie
 configurations. This file grants all permissions to local code included
-in the <code>lib</code> subdirectory of the starter kit installation. <p>
+in the <code>lib</code> subdirectory of the Apache River release installation. <p>
 
 <blockquote>
 <pre>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/start/SharedActivationPolicyPermission.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/start/SharedActivationPolicyPermission.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/start/SharedActivationPolicyPermission.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/start/SharedActivationPolicyPermission.java Tue Oct 16 15:32:23 2007
@@ -49,7 +49,7 @@
  * import codebase to use 
  * <code><VAR><B>policy_dir</B></VAR>${/}policy.fiddler</code> for their
  * policy file, where <VAR><B>install_dir</B></VAR> is the installation
- * directory of the starter kit and <VAR><B>policy_dir</B></VAR> is the
+ * directory of the Apache River release and <VAR><B>policy_dir</B></VAR> is the
  * pathname to the directory containing the policy file.
  *
  * @author Sun Microsystems, Inc.

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/start/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/start/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/start/package.html (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/start/package.html Tue Oct 16 15:32:23 2007
@@ -20,7 +20,7 @@
 <body bgcolor="white">
 
 Provides the utilities and APIs used to launch the contributed services 
-provided in the Jini(TM) Technology Starter Kit (starter kit). 
+provided in the Apache River release. 
 <P>
 This document covers the following service starter topics:
 <UL>
@@ -82,7 +82,7 @@
 
 where <var><b>java_options</b></var> includes such things as the security
 policy file and security manager, <var><b>install_dir</b></var>
-is the directory where the starter kit is installed, and
+is the directory where the Apache River release is installed, and
 <var><b>config_options</b></var> includes any
 {@link net.jini.config.Configuration Configuration} provider options. 
 <p>
@@ -205,7 +205,7 @@
 <ul>
 <li> The Java(TM) 2 Platform, Standard Edition, (J2SE(TM)) has been
      installed, and its commands are available in the current path
-<li> The starter kit has been installed in the
+<li> The Apache River release has been installed in the
      <var><b>install_dir</b></var> directory
 <li> The example configuration and policy files described below are
      available in the <var><b>config_dir</b></var> directory
@@ -259,7 +259,7 @@
 
 Use this security policy file for starting and running all service
 configurations. This file grants all permissions to local code included
-in the <code>lib</code> subdirectory of the starter kit installation.<p>
+in the <code>lib</code> subdirectory of the Apache River release installation.<p>
 
 <blockquote>
 <pre>
@@ -356,7 +356,7 @@
 	    norm_impl, new String[] { norm_config });
 
     //	   
-    // Outrigger (JavaSpaces(TM) Service)
+    // Outrigger (JavaSpaces Service)
     //
     private static outrigger_codebase = "http://<var><b>your_host</b></var>:<var><b>http_port</b></var>/outrigger-dl.jar"
 	+ " http://<var><b>your_host</b></var>:<var><b>http_port</b></var>/jsk-dl.jar";
@@ -603,7 +603,7 @@
 	    norm_impl, new String[] { norm_config });
 
     //	   
-    // Outrigger (JavaSpaces(TM) Service)
+    // Outrigger (JavaSpaces Service)
     //
     private static outrigger_codebase = "http://<var><b>your_host</b></var>:<var><b>http_port</b></var>/outrigger-dl.jar"
 	+ " http://<var><b>your_host</b></var>:<var><b>http_port</b></var>/jsk-dl.jar";
@@ -965,7 +965,7 @@
 	    true);
 
     //	   
-    // Outrigger (JavaSpaces(TM) Service)
+    // Outrigger (JavaSpaces Service)
     //
     private static outrigger_codebase = "http://<var><b>your_host</b></var>:<var><b>http_port</b></var>/outrigger-dl.jar"
 	+ " http://<var><b>your_host</b></var>:<var><b>http_port</b></var>/jsk-dl.jar";
@@ -1211,7 +1211,7 @@
 </ul>
 <p>
 <code>Phoenix</code> is part
-of the starter kit. <code>Phoenix</code> has better support for Jini ERI, is
+of the Apache River release. <code>Phoenix</code> has better support for Jini ERI, is
 configurable, and supports net.jini.security, making it suitable for
 a much broader range of deployments than <code>rmid</code>.
 <p>

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/CheckConfigurationFile.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/CheckConfigurationFile.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/CheckConfigurationFile.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/CheckConfigurationFile.java Tue Oct 16 15:32:23 2007
@@ -83,9 +83,9 @@
  * actual type is not assignable to the expected type, is treated as an
  * error. <p>
  *
- * Entry description files for all of the starter kit services and utilities
+ * Entry description files for all of the Apache River release services and utilities
  * are provided in the <code>configentry</code> subdirectory beneath the
- * top-level directory of the starter kit installation. <p>
+ * top-level directory of the Apache River release installation. <p>
  *
  * Here is a sample entry description file:
  *
@@ -132,7 +132,7 @@
  * </pre>
  * </blockquote>
  * 
- * where <var><b>install_dir</b></var> is the directory where the starter kit
+ * where <var><b>install_dir</b></var> is the directory where the Apache River release
  * is installed, and <var><b>your-norm.config</b></var> is a configuration
  * source file intended for use with the transient {@linkplain
  * com.sun.jini.norm Norm} service implementation. This command will print out

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassDep.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassDep.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassDep.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassDep.java Tue Oct 16 15:32:23 2007
@@ -79,7 +79,7 @@
  *      -cp <var><b>input_classpath</b></var> <var><b>processing_options</b></var> <var><b>output_options</b></var>
  * </pre></blockquote>
  * <p>
- * where <var><b>install_dir</b></var> is the directory where the starter kit
+ * where <var><b>install_dir</b></var> is the directory where the Apache River release
  * is installed.
  * Note that the options for this tool can be specified in any order, and
  * can be intermixed.
@@ -90,7 +90,7 @@
  * is an argument to the <code>ClassDep</code> tool itself and should
  * include all of the classes that might need to be included in the
  * dependency analysis. Typically this will include all of your application
- * classes, classes from the starter kit, and any other classes on which
+ * classes, classes from the Apache River release, and any other classes on which
  * your classes might depend. It is safe to include more classes than are
  * actually necessary (since the purpose of this tool is, after all, to
  * determine which subset of these classes is actually necessary), but it is
@@ -332,7 +332,7 @@
  * <a name="examples"></a>
  * <h3>Examples</h3>
  *
- * (The examples in this section assume you ran the starter kit installer
+ * (The examples in this section assume you ran the Apache River release installer
  * with an "Install Set" selection that created the top-level
  * <code>classes</code> directory. Alternatively, if you have compiled from
  * the source code, substitute <code>source/classes</code> for

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassServer.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassServer.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassServer.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/ClassServer.java Tue Oct 16 15:32:23 2007
@@ -120,7 +120,7 @@
  *        -port 8081 -dir <var><b>install_dir</b></var>/lib-dl -verbose
  * </pre></blockquote>
  * where <var><b>install_dir</b></var>
- * is the directory where the starter kit is installed.
+ * is the directory where the Apache River release is installed.
  * This command places the class server on the (non-default) port 
  * 8081, which  serves out the files under the (non-default) directory  
  * <var><b>install_dir</b></var>/lib-dl. The <code>-verbose</code> option

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeDigest.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeDigest.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeDigest.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeDigest.java Tue Oct 16 15:32:23 2007
@@ -40,7 +40,7 @@
  * </pre>
  * </blockquote>
  *
- * where <var><b>install_dir</b></var> is the directory where the starter kit
+ * where <var><b>install_dir</b></var> is the directory where the Apache River release
  * is installed. This command prints out the message digest for the
  * <code>reggie.jar</code> JAR file, using the <code>sha</code> algorithm.
  *

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/ComputeHttpmdCodebase.java Tue Oct 16 15:32:23 2007
@@ -42,7 +42,7 @@
  * </pre>
  * </blockquote>
  *
- * where <var><b>install_dir</b></var> is the directory where the starter kit
+ * where <var><b>install_dir</b></var> is the directory where the Apache River release
  * is installed, <var><b>your_host</b></var> is the host where the HTTP server
  * for the <code>sdm-dl.jar</code> JAR file will be running, and
  * <var><b>http_port</b></var> is the port for that server. This command prints

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/DebugDynamicPolicyProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/DebugDynamicPolicyProvider.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/DebugDynamicPolicyProvider.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/DebugDynamicPolicyProvider.java Tue Oct 16 15:32:23 2007
@@ -108,10 +108,10 @@
  * To use this security policy provider, do the following: <ul>
  *
  * <li> Copy the <code>jsk-policy.jar</code> file from the <code>lib-ext</code>
- * subdirectory of the Jini(TM) Technology Starter Kit (starter kit)
+ * subdirectory of the Apache River release
  * installation to the extensions directory of the Java(TM) 2 SDK (or JRE)
  * installation, and copy the <code>jsk-debug-policy.jar</code> file
- * from the <code>lib</code> subdirectory of the starter kit installation to
+ * from the <code>lib</code> subdirectory of the Apache River release installation to
  * the extensions directory of the Java 2 SDK (or JRE) installation.
  *
  * <li> Specify this class as the security policy provider. Create a copy of

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/JarWrapper.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/JarWrapper.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/JarWrapper.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/JarWrapper.java Tue Oct 16 15:32:23 2007
@@ -120,7 +120,7 @@
  * % java -jar <var><b>install_dir</b></var>/lib/jarwrapper.jar \
  *        -httpmd=SHA-1 wrapper.jar base_dir src1.jar src2.jar
  * </pre></blockquote>
- * where <var><b>jsk_install_dir</b></var> is the directory where the starter kit
+ * where <var><b>jsk_install_dir</b></var> is the directory where the Apache River release
  * is installed. This command line would result in the creation of a wrapper
  * JAR file, <code>wrapper.jar</code>, in the current working directory, whose
  * contents would be based on the source JAR files <code>src1.jar</code> and

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/PreferredListGen.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/PreferredListGen.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/PreferredListGen.java (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/PreferredListGen.java Tue Oct 16 15:32:23 2007
@@ -111,7 +111,7 @@
  * <dt><b><code>-cp</code> <var>input_classpath</var></b>
  * <dd>Identifies the classpath for all of the classes that might need to be
  * included in the dependency analysis. Typically this will include all of your
- * application classes, classes from the starter kit, and any other classes on
+ * application classes, classes from the Apache River release, and any other classes on
  * which your classes might depend. It is safe to include more classes than are
  * actually necessary because the tool limits the scope of the preferred list to
  * those classes actually included in the JAR files being analyzed.  It is not

Modified: incubator/river/trunk/jtsk/src/com/sun/jini/tool/envcheck/plugins/resources/checkjskpolicy.properties
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/com/sun/jini/tool/envcheck/plugins/resources/checkjskpolicy.properties?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/com/sun/jini/tool/envcheck/plugins/resources/checkjskpolicy.properties (original)
+++ incubator/river/trunk/jtsk/src/com/sun/jini/tool/envcheck/plugins/resources/checkjskpolicy.properties Tue Oct 16 15:32:23 2007
@@ -13,7 +13,7 @@
                  the extensions directory of the JRE. Failure to load that \
                  jar from the extensions directory may indicate that the \
                  JRE used to run the Jini component is not the same one \
-                 identified when the starter kit was installed.
+                 identified when the Apache River release was installed.
 
 policyOK=jsk-policy.jar was loaded from the extensions directory as expected
 

Modified: incubator/river/trunk/jtsk/src/net/jini/config/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/config/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/config/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/config/package.html Tue Oct 16 15:32:23 2007
@@ -113,7 +113,7 @@
 </pre> <p>
 
 Here are the contents of another <code>ConfigurationFile</code> to
-export the object using a Jini(TM) extensible remote invocation (Jini
+export the object using a Jini extensible remote invocation (Jini
 ERI) exporter over HTTP on a specific port: <p>
 
 <pre>

Modified: incubator/river/trunk/jtsk/src/net/jini/core/discovery/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/core/discovery/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/core/discovery/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/core/discovery/package.html Tue Oct 16 15:32:23 2007
@@ -21,7 +21,7 @@
 
 A standard utility class for finding particular lookup services.
 
-@see "<i>Jini(TM) Discovery and Join Specification</i>"
+@see "<i>Jini Discovery and Join Specification</i>"
 
 </BODY>
 </HTML>

Modified: incubator/river/trunk/jtsk/src/net/jini/core/entry/Entry.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/core/entry/Entry.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/core/entry/Entry.java (original)
+++ incubator/river/trunk/jtsk/src/net/jini/core/entry/Entry.java Tue Oct 16 15:32:23 2007
@@ -19,7 +19,7 @@
 
 /**
  * This class is the supertype of all entries that can be stored in a
- * Jini(TM) Lookup service.
+ * Jini Lookup service.
  * <p>
  * Each field of an entry must be a public reference (object) type.
  * You cannot store primitive types in fields of an

Modified: incubator/river/trunk/jtsk/src/net/jini/core/entry/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/core/entry/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/core/entry/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/core/entry/package.html Tue Oct 16 15:32:23 2007
@@ -27,7 +27,7 @@
 @see net.jini.core.lookup.ServiceRegistrar
 @see net.jini.space.JavaSpace
 
-@see "<i>Jini(TM) Entry Specification</i>"
+@see "<i>Jini Entry Specification</i>"
 
 </BODY>
 </HTML>

Modified: incubator/river/trunk/jtsk/src/net/jini/core/event/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/core/event/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/core/event/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/core/event/package.html Tue Oct 16 15:32:23 2007
@@ -21,7 +21,7 @@
 
 The <CODE>RemoteEventListener</CODE> interface and related standard classes.
 
-@see "<i>Jini(TM) Distributed Event Specification</i>"
+@see "<i>Jini Distributed Event Specification</i>"
 
 </BODY>
 </HTML>

Modified: incubator/river/trunk/jtsk/src/net/jini/core/lease/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/core/lease/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/core/lease/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/core/lease/package.html Tue Oct 16 15:32:23 2007
@@ -29,7 +29,7 @@
 grantor may allow the holder to renew the lease, thereby extending the pledge
 to a later time.
 
-@see "<i>Jini(TM) Distributed Leasing Specification</i>"
+@see "<i>Jini Distributed Leasing Specification</i>"
 
 </BODY>
 </HTML>

Modified: incubator/river/trunk/jtsk/src/net/jini/core/lookup/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/core/lookup/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/core/lookup/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/core/lookup/package.html Tue Oct 16 15:32:23 2007
@@ -23,7 +23,7 @@
 services are found in a system.  The primary service interface is
 <CODE>ServiceRegistrar</CODE>.
 
-@see "<i>Jini(TM) Lookup Service Specification</i>"
+@see "<i>Jini Lookup Service Specification</i>"
 
 </BODY>
 </HTML>

Modified: incubator/river/trunk/jtsk/src/net/jini/core/transaction/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/core/transaction/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/core/transaction/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/core/transaction/package.html Tue Oct 16 15:32:23 2007
@@ -30,7 +30,7 @@
 <CODE>net.jini.core.transaction.server</CODE>.
 
 @see net.jini.core.transaction.server
-@see "<i>Jini(TM) Transaction Specification</i>"
+@see "<i>Jini Transaction Specification</i>"
 
 </BODY>
 </HTML>

Modified: incubator/river/trunk/jtsk/src/net/jini/core/transaction/server/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/core/transaction/server/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/core/transaction/server/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/core/transaction/server/package.html Tue Oct 16 15:32:23 2007
@@ -27,7 +27,7 @@
 <CODE>TransactionParticipant</CODE> and <CODE>TransactionManager</CODE>
 (and <CODE>NestableTransactionManager</CODE>) interfaces defined here.
 
-@see "<i>Jini(TM) Transaction Specification</i>"
+@see "<i>Jini Transaction Specification</i>"
 
 </BODY>
 </HTML>

Modified: incubator/river/trunk/jtsk/src/net/jini/discovery/LookupDiscoveryManager.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/discovery/LookupDiscoveryManager.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/discovery/LookupDiscoveryManager.java (original)
+++ incubator/river/trunk/jtsk/src/net/jini/discovery/LookupDiscoveryManager.java Tue Oct 16 15:32:23 2007
@@ -503,7 +503,7 @@
          *        When the discard is a no-interest discard, if the discarded
          *        reg was previously discovered by ONLY locator discovery,
          *        then a discarded event is sent; otherwise, no event is sent
-         *        (see section DU.2.5.1 of the "Jini(TM) Discovery Utilities
+         *        (see section DU.2.5.1 of the "Jini Discovery Utilities
          *        Specification").
          *  </ul><p>
          *  The logic described above can be collapsed into the following
@@ -718,7 +718,7 @@
          *        discard is an active no-interest discard, if the discarded
          *        reg was previously discovered by ONLY group discovery, then
          *        a discarded event is sent; otherwise, no event is sent
-         *        (see section DU.2.4.1 of the "Jini(TM) Discovery Utilities
+         *        (see section DU.2.4.1 of the "Jini Discovery Utilities
          *        Specification").
          *   <li> if the member groups contained in the discarded event from
          *        the <code>LookupDiscovery</code> neither intersect the

Modified: incubator/river/trunk/jtsk/src/net/jini/discovery/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/discovery/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/discovery/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/discovery/package.html Tue Oct 16 15:32:23 2007
@@ -20,9 +20,9 @@
 <BODY BGCOLOR="white">
 
 These are utility classes and interfaces that conform to the discovery and join
-protocol defined in the <i>Jini(TM) Discovery and Join Specification</i>.
+protocol defined in the <i>Jini Discovery and Join Specification</i>.
 
-@see "<i>Jini(TM) Discovery and Join Specification</i>"
+@see "<i>Jini Discovery and Join Specification</i>"
 
 </BODY>
 </HTML>

Modified: incubator/river/trunk/jtsk/src/net/jini/entry/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/entry/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/entry/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/entry/package.html Tue Oct 16 15:32:23 2007
@@ -24,12 +24,12 @@
 which exact-match lookup semantics are useful. An entry is a typed set of
 objects, each of which may be tested for exact match with a template. The
 details of entries and their semantics are discussed in the <a
-href=http://www.jini.org/standards/index.html>Jini(TM) Entry
+href=http://www.jini.org/standards/index.html>Jini Entry
 Specification</a>.<p>
 
 @see net.jini.core.entry
 @see <a href=http://www.jini.org/standards/index.html>
-     Jini(TM) Entry Specification</a>
+     Jini Entry Specification</a>
 @version 2.0
 @since 1.0
 </BODY>

Modified: incubator/river/trunk/jtsk/src/net/jini/export/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/export/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/export/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/export/package.html Tue Oct 16 15:32:23 2007
@@ -85,7 +85,7 @@
   </tr>
   <tr>
     <td valign=top>{@link net.jini.jeri.BasicJeriExporter}</td>
-    <td>Exports an object to use Jini(TM) extensible remote invocation
+    <td>Exports an object to use Jini extensible remote invocation
 (Jini ERI).  A remote object exported with
 <code>BasicJeriExporter</code> can have associated custom remote
 invocation and dispatch behavior, as well as a customized

Modified: incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriExporter.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriExporter.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriExporter.java (original)
+++ incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriExporter.java Tue Oct 16 15:32:23 2007
@@ -42,7 +42,7 @@
 
 /**
  * An <code>Exporter</code> implementation for exporting
- * a remote object to use Jini(TM) extensible remote invocation
+ * a remote object to use Jini extensible remote invocation
  * (Jini ERI).  Typically, instances of this class should be
  * obtained from a {@link Configuration} rather than being explicitly
  * constructed.

Modified: incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriTrustVerifier.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriTrustVerifier.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriTrustVerifier.java (original)
+++ incubator/river/trunk/jtsk/src/net/jini/jeri/BasicJeriTrustVerifier.java Tue Oct 16 15:32:23 2007
@@ -32,7 +32,7 @@
 import net.jini.security.proxytrust.TrustEquivalence;
 
 /**
- * Trust verifier for dynamic proxies and object endpoints used in Jini(TM)
+ * Trust verifier for dynamic proxies and object endpoints used in Jini
  * extensible remote invocation (Jini ERI). This class is intended to be
  * specified in a resource to configure the operation of {@link
  * Security#verifyObjectTrust Security.verifyObjectTrust}.

Modified: incubator/river/trunk/jtsk/src/net/jini/jeri/ProxyTrustILFactory.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/jeri/ProxyTrustILFactory.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/jeri/ProxyTrustILFactory.java (original)
+++ incubator/river/trunk/jtsk/src/net/jini/jeri/ProxyTrustILFactory.java Tue Oct 16 15:32:23 2007
@@ -25,7 +25,7 @@
 import net.jini.security.proxytrust.ServerProxyTrust;
 
 /**
- * Invocation layer factory for remote objects exported to use Jini(TM)
+ * Invocation layer factory for remote objects exported to use Jini
  * extensible remote invocation (Jini ERI) that produces proxies that
  * additionally implement the {@link ProxyTrust} interface. The remote object
  * being exported must be an instance of {@link ServerProxyTrust}, and the

Modified: incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ConnectionManager.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ConnectionManager.java (original)
+++ incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ConnectionManager.java Tue Oct 16 15:32:23 2007
@@ -41,7 +41,7 @@
 
 /**
  * Provides client-side connection management using the <a
- * href="{@docRoot}/net/jini/jeri/connection/doc-files/mux.html">Jini(TM)
+ * href="{@docRoot}/net/jini/jeri/connection/doc-files/mux.html">Jini
  * extensible remote invocation (Jini ERI) multiplexing protocol</a>
  * to frame and multiplex requests and responses over connections.
  *

Modified: incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ServerConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ServerConnectionManager.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ServerConnectionManager.java (original)
+++ incubator/river/trunk/jtsk/src/net/jini/jeri/connection/ServerConnectionManager.java Tue Oct 16 15:32:23 2007
@@ -35,7 +35,7 @@
 
 /**
  * Provides server-side connection management using the <a
- * href="{@docRoot}/net/jini/jeri/connection/doc-files/mux.html">Jini(TM)
+ * href="{@docRoot}/net/jini/jeri/connection/doc-files/mux.html">Jini
  * extensible remote invocation (Jini ERI) multiplexing protocol</a>
  * to frame and multiplex requests and responses over connections.
  *

Modified: incubator/river/trunk/jtsk/src/net/jini/jeri/connection/doc-files/mux.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/jeri/connection/doc-files/mux.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/jeri/connection/doc-files/mux.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/jeri/connection/doc-files/mux.html Tue Oct 16 15:32:23 2007
@@ -20,7 +20,7 @@
 <html>
 <head>
 
-<title>Jini(TM) Extensible Remote Invocation (Jini ERI)
+<title>Jini Extensible Remote Invocation (Jini ERI)
        Multiplexing Protocol
 </title>
 
@@ -30,11 +30,11 @@
 
 <body bgcolor="white">
 
-<h2 align="center">Jini(TM) Extensible Remote Invocation
+<h2 align="center">Jini Extensible Remote Invocation
 		   (Jini&nbsp;ERI) Multiplexing Protocol
 </h2>
 
-This page defines the Jini(TM) extensible remote invocation (Jini ERI)
+This page defines the Jini extensible remote invocation (Jini ERI)
 multiplexing protocol, which is used by the following Jini ERI
 transport layer implementation classes:
 

Modified: incubator/river/trunk/jtsk/src/net/jini/jeri/connection/package.html
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/jeri/connection/package.html?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/jeri/connection/package.html (original)
+++ incubator/river/trunk/jtsk/src/net/jini/jeri/connection/package.html Tue Oct 16 15:32:23 2007
@@ -24,7 +24,7 @@
 <body bgcolor="white">
 
 Provides interfaces and classes for implementing connection-based
-Jini(TM) extensible remote invocation (Jini ERI) transport layer
+Jini extensible remote invocation (Jini ERI) transport layer
 providers.
 
 <p>With the implementation model of this package, a connection-based
@@ -48,7 +48,7 @@
 <p>{@link net.jini.jeri.connection.ConnectionManager} and {@link
 net.jini.jeri.connection.ServerConnectionManager} provide client-side
 and server-side connection management using the <a
-href="doc-files/mux.html">Jini(TM) extensible remote invocation (Jini
+href="doc-files/mux.html">Jini extensible remote invocation (Jini
 ERI) multiplexing protocol</a>.
 
 @since 2.0

Modified: incubator/river/trunk/jtsk/src/net/jini/jeri/kerberos/KerberosEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/trunk/jtsk/src/net/jini/jeri/kerberos/KerberosEndpoint.java?rev=585277&r1=585276&r2=585277&view=diff
==============================================================================
--- incubator/river/trunk/jtsk/src/net/jini/jeri/kerberos/KerberosEndpoint.java (original)
+++ incubator/river/trunk/jtsk/src/net/jini/jeri/kerberos/KerberosEndpoint.java Tue Oct 16 15:32:23 2007
@@ -175,7 +175,7 @@
  * happen, the TGT for the request has to be forwardable. <p>
  *
  * This class uses the <a
- * href="../connection/doc-files/mux.html">Jini(TM) extensible remote
+ * href="../connection/doc-files/mux.html">Jini extensible remote
  * invocation (Jini ERI) multiplexing protocol</a> to map outgoing
  * requests to the underlying secure connection streams. <p>
  *



Mime
View raw message