river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peter_firmst...@apache.org
Subject svn commit: r1059307 [3/5] - in /incubator/river/jtsk/skunk/modules: river-libs/river-dl/src/main/java/net/jini/discovery/ river-libs/river-dl/src/main/java/net/jini/lookup/entry/ river-libs/river-dl/src/main/java/org/apache/river/admin/ river-libs/riv...
Date Sat, 15 Jan 2011 12:03:42 GMT
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,11 +18,11 @@
 
 package net.jini.jeri.ssl;
 
-import com.sun.jini.discovery.internal.EndpointInternals;
-import com.sun.jini.discovery.internal.SslEndpointInternalsAccess;
-import com.sun.jini.jeri.internal.connection.ConnManagerFactory;
-import com.sun.jini.jeri.internal.connection.ServerConnManager;
-import com.sun.jini.logging.Levels;
+import org.apache.river.discovery.internal.EndpointInternals;
+import org.apache.river.discovery.internal.SslEndpointInternalsAccess;
+import org.apache.river.jeri.internal.connection.ConnManagerFactory;
+import org.apache.river.jeri.internal.connection.ServerConnManager;
+import org.apache.river.logging.Levels;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
@@ -170,7 +170,7 @@ import net.jini.security.proxytrust.Trus
  * @see SslTrustVerifier
  * @since 2.0
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * This implementation uses the <a
  * href="http://java.sun.com/j2se/1.4/docs/guide/security/jsse/JSSERefGuide.html"
@@ -229,7 +229,7 @@ import net.jini.security.proxytrust.Trus
  *
  * <ul>
  * <li> {@link SSLContext}, with the protocol specified by the
- *	<code>com.sun.jini.jeri.ssl.sslProtocol</code> system property, or
+ *	<code>org.apache.river.jeri.ssl.sslProtocol</code> system property, or
  *	<code>"TLS"</code> if that property is not defined, to provide the
  *	TLS/SSL implementation. The {@link SSLContext#init SSLContext.init}
  *	method is called with <code>null</code> for the <code>random</code>
@@ -237,7 +237,7 @@ import net.jini.security.proxytrust.Trus
  * <li> {@link CertificateFactory}, with type <code>"X.509"</code>, to generate
  *	<code>CertPath</code> instances from X.509 certificate chains
  * <li> {@link TrustManagerFactory}, with the algorithm specified by the
- *	<code>com.sun.jini.jeri.ssl.trustManagerFactoryAlgorithm</code> system
+ *	<code>org.apache.river.jeri.ssl.trustManagerFactoryAlgorithm</code> system
  *	property, or the default algorithm if that property is not defined, to
  *	implement trust management for the TLS/SSL implementation. The factory
  *	must return trust managers that implement {@link X509TrustManager}.
@@ -260,20 +260,20 @@ import net.jini.security.proxytrust.Trus
  * This implementation recognizes the following system properties: <p>
  * 
  * <ul>
- * <li> <code>com.sun.jini.jeri.ssl.maxClientSessionDuration</code> - The
+ * <li> <code>org.apache.river.jeri.ssl.maxClientSessionDuration</code> - The
  *	maximum number of milliseconds a client-side TLS/SSL session should be
  *	used. The default is 23.5 hours. The value should be smaller than the
  *	maximum server session duration to allow the client to negotiate a new
  *	session before the server timeout occurs.
- * <li> <code>com.sun.jini.jeri.ssl.sslProtocol</code> - The secure socket
+ * <li> <code>org.apache.river.jeri.ssl.sslProtocol</code> - The secure socket
  *	protocol used when obtaining {@link SSLContext} instances. The default
  *	is <code>"TLS"</code>.
- * <li> <code>com.sun.jini.jeri.ssl.trustManagerFactoryAlgorithm</code> - The
+ * <li> <code>org.apache.river.jeri.ssl.trustManagerFactoryAlgorithm</code> - The
  *	algorithm used when obtaining {@link TrustManagerFactory}
  *	instances. The default is the value returned by {@link
  *	TrustManagerFactory#getDefaultAlgorithm
  *	TrustManagerFactory.getDefaultAlgorithm}.
- * <li> <code>com.sun.jini.jeri.ssl.cipherSuites</code> - The TLS/SSL cipher
+ * <li> <code>org.apache.river.jeri.ssl.cipherSuites</code> - The TLS/SSL cipher
  *	suites that should be used for communication. The default is the list
  *	of suites supported by the JSSE implementation. The value should
  *	specify the suite names, separated by commas. The value will be ignored

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpointImpl.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpointImpl.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpointImpl.java Sat Jan 15 12:03:35 2011
@@ -18,12 +18,12 @@
 
 package net.jini.jeri.ssl;
 
-import com.sun.jini.jeri.internal.connection.BasicConnManagerFactory;
-import com.sun.jini.jeri.internal.connection.ConnManager;
-import com.sun.jini.jeri.internal.connection.ConnManagerFactory;
-import com.sun.jini.jeri.internal.runtime.Util;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.jeri.internal.connection.BasicConnManagerFactory;
+import org.apache.river.jeri.internal.connection.ConnManager;
+import org.apache.river.jeri.internal.connection.ConnManagerFactory;
+import org.apache.river.jeri.internal.runtime.Util;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
 import java.io.IOException;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
 
 package net.jini.jeri.ssl;
 
-import com.sun.jini.logging.Levels;
+import org.apache.river.logging.Levels;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
@@ -196,7 +196,7 @@ import net.jini.security.SecurityContext
  * @see ConfidentialityStrength
  * @since 2.0
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * This implementation uses the <a
  * href="http://java.sun.com/j2se/1.4/docs/guide/security/jsse/JSSERefGuide.html"
@@ -260,7 +260,7 @@ import net.jini.security.SecurityContext
  *
  * <ul>
  * <li> {@link SSLContext}, with the protocol specified by the
- *	<code>com.sun.jini.jeri.ssl.sslProtocol</code> system property, or
+ *	<code>org.apache.river.jeri.ssl.sslProtocol</code> system property, or
  *	<code>"TLS"</code> if that property is not defined, to provide the
  *	TLS/SSL implementation. The {@link SSLContext#init SSLContext.init}
  *	method is called with <code>null</code> for the <code>random</code>
@@ -268,7 +268,7 @@ import net.jini.security.SecurityContext
  * <li> {@link CertificateFactory}, with type <code>"X.509"</code>, to generate
  *	<code>CertPath</code> instances from X.509 certificate chains
  * <li> {@link TrustManagerFactory}, with the algorithm specified by the
- *	<code>com.sun.jini.jeri.ssl.trustManagerFactoryAlgorithm</code> system
+ *	<code>org.apache.river.jeri.ssl.trustManagerFactoryAlgorithm</code> system
  *	property, or the default algorithm if that property is not defined, to
  *	implement trust management for the TLS/SSL implementation. The factory
  *	must return trust managers that implement {@link X509TrustManager}.
@@ -291,20 +291,20 @@ import net.jini.security.SecurityContext
  * This implementation recognizes the following system properties: <p>
  * 
  * <ul>
- * <li> <code>com.sun.jini.jeri.ssl.maxServerSessionDuration</code> - The
+ * <li> <code>org.apache.river.jeri.ssl.maxServerSessionDuration</code> - The
  *	maximum number of milliseconds a server-side TLS/SSL session should be
  *	used before expiring. The default is 24 hours. The value used should be
  *	larger than the maximum client session duration to allow the client to
  *	negotiate a new session before the server timeout occurs.
- * <li> <code>com.sun.jini.jeri.ssl.sslProtocol</code> - The secure socket
+ * <li> <code>org.apache.river.jeri.ssl.sslProtocol</code> - The secure socket
  *	protocol used when obtaining {@link SSLContext} instances. The default
  *	is <code>"TLS"</code>.
- * <li> <code>com.sun.jini.jeri.ssl.trustManagerFactoryAlgorithm</code> - The
+ * <li> <code>org.apache.river.jeri.ssl.trustManagerFactoryAlgorithm</code> - The
  *	algorithm used when obtaining {@link TrustManagerFactory}
  *	instances. The default is the value returned by {@link
  *	TrustManagerFactory#getDefaultAlgorithm
  *	TrustManagerFactory.getDefaultAlgorithm}.
- * <li> <code>com.sun.jini.jeri.ssl.cipherSuites</code> - The TLS/SSL cipher
+ * <li> <code>org.apache.river.jeri.ssl.cipherSuites</code> - The TLS/SSL cipher
  *	suites that should be used for communication. The default is the list
  *	of suites supported by the JSSE implementation. The value should
  *	specify the suite names, separated by commas. The value will be ignored

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpointImpl.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpointImpl.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpointImpl.java Sat Jan 15 12:03:35 2011
@@ -18,13 +18,13 @@
 
 package net.jini.jeri.ssl;
 
-import com.sun.jini.action.GetLongAction;
-import com.sun.jini.jeri.internal.connection.BasicServerConnManager;
-import com.sun.jini.jeri.internal.connection.ServerConnManager;
-import com.sun.jini.jeri.internal.runtime.Util;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.thread.Executor;
-import com.sun.jini.thread.GetThreadPoolAction;
+import org.apache.river.action.GetLongAction;
+import org.apache.river.jeri.internal.connection.BasicServerConnManager;
+import org.apache.river.jeri.internal.connection.ServerConnManager;
+import org.apache.river.jeri.internal.runtime.Util;
+import org.apache.river.logging.Levels;
+import org.apache.river.thread.Executor;
+import org.apache.river.thread.GetThreadPoolAction;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -103,7 +103,7 @@ class SslServerEndpointImpl extends Util
      */
     static long maxServerSessionDuration =
 	((Long) Security.doPrivileged(
-	    new GetLongAction("com.sun.jini.jeri.ssl.maxServerSessionDuration",
+	    new GetLongAction("org.apache.river.jeri.ssl.maxServerSessionDuration",
 			      24 * 60 * 60 * 1000))).longValue();
 
     /**

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/Utilities.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/Utilities.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/Utilities.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/Utilities.java Sat Jan 15 12:03:35 2011
@@ -18,8 +18,8 @@
 
 package net.jini.jeri.ssl;
 
-import com.sun.jini.action.GetPropertyAction;
-import com.sun.jini.collection.WeakSoftTable;
+import org.apache.river.action.GetPropertyAction;
+import org.apache.river.collection.WeakSoftTable;
 import java.lang.ref.ReferenceQueue;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
@@ -189,7 +189,7 @@ abstract class Utilities {
     private static String[] requestedCipherSuites;
     static {
 	String value = (String) Security.doPrivileged(
-	    new GetPropertyAction("com.sun.jini.jeri.ssl.cipherSuites"));
+	    new GetPropertyAction("org.apache.river.jeri.ssl.cipherSuites"));
 	if (value == null) {
 	    requestedCipherSuites = null;
 	} else {
@@ -224,7 +224,7 @@ abstract class Utilities {
 
     /** The secure socket protocol used with JSSE. */
     private static final String sslProtocol = (String) Security.doPrivileged(
-	new GetPropertyAction("com.sun.jini.jeri.ssl.sslProtocol", "TLS"));
+	new GetPropertyAction("org.apache.river.jeri.ssl.sslProtocol", "TLS"));
 
     /** Permission needed to access the current subject. */
     static final AuthPermission getSubjectPermission =

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/package.html Sat Jan 15 12:03:35 2011
@@ -232,7 +232,7 @@ requests to socket connections.
 @since 2.0
 @version 2.0
 
-@com.sun.jini.impl <!-- Implementation Specifics -->
+@org.apache.river.impl <!-- Implementation Specifics -->
 
 This implementation uses the <a
 href="http://java.sun.com/j2se/1.4/docs/guide/security/jsse/JSSERefGuide.html"
@@ -284,10 +284,10 @@ discovery providers
 
 <tr> <th scope="col"> Level <th scope="col"> Description
 
-<tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED} <td>
+<tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED} <td>
 problems with outbound requests
 
-<tr> <td> {@link com.sun.jini.logging.Levels#HANDLED HANDLED} <td>
+<tr> <td> {@link org.apache.river.logging.Levels#HANDLED HANDLED} <td>
 exceptions caught involving authentication
 
 <tr> <td> {@link java.util.logging.Level#FINE FINE} <td> authentication
@@ -313,11 +313,11 @@ operation tracing
 accepting or handling server connections, or with handling inbound
 requests
 
-<tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED} <td>
+<tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED} <td>
 problems with checking constraints or permissions, with enumerating
 listen endpoints, or with security issues for inbound requests
 
-<tr> <td> {@link com.sun.jini.logging.Levels#HANDLED HANDLED} <td>
+<tr> <td> {@link org.apache.river.logging.Levels#HANDLED HANDLED} <td>
 exceptions caught involving authentication
 
 <tr> <td> {@link java.util.logging.Level#FINE FINE} <td> creating
@@ -330,7 +330,7 @@ operation tracing
 
 </table> <p>
 
-See the {@link com.sun.jini.logging.LogManager} class for one way to use
+See the {@link org.apache.river.logging.LogManager} class for one way to use
 the <code>FAILED</code> and <code>HANDLED</code> logging levels in
 standard logging configuration files. <p>
 
@@ -342,7 +342,7 @@ This implementation uses the following s
 
 <ul>
 <li> {@link javax.net.ssl.SSLContext}, with the protocol specified by
-     the <code>com.sun.jini.jeri.ssl.sslProtocol</code> system property,
+     the <code>org.apache.river.jeri.ssl.sslProtocol</code> system property,
      or <code>"TLS"</code> if that property is not defined, to provide
      the TLS/SSL implementation. The {@link
      javax.net.ssl.SSLContext#init SSLContext.init} method is called
@@ -353,7 +353,7 @@ This implementation uses the following s
      from X.509 certificate chains
 <li> {@link javax.net.ssl.TrustManagerFactory}, with the algorithm
      specified by the
-     <code>com.sun.jini.jeri.ssl.trustManagerFactoryAlgorithm</code>
+     <code>org.apache.river.jeri.ssl.trustManagerFactoryAlgorithm</code>
      system property, or the default algorithm if that property is not
      defined, to implement trust management for the TLS/SSL
      implementation. The factory must return trust managers that
@@ -378,27 +378,27 @@ Both the TLS/SSL and HTTPS implementatio
 system properties: <p>
 
 <ul>
-<li> <code>com.sun.jini.jeri.ssl.maxServerSessionDuration</code> - The
+<li> <code>org.apache.river.jeri.ssl.maxServerSessionDuration</code> - The
      maximum number of milliseconds a server-side TLS/SSL session should
      be used before expiring. The default is 24 hours. The value used
      should be larger than the maximum client session duration to allow
      the client to negotiate a new session before the server timeout
      occurs.
-<li> <code>com.sun.jini.jeri.ssl.maxClientSessionDuration</code> - The
+<li> <code>org.apache.river.jeri.ssl.maxClientSessionDuration</code> - The
      maximum number of milliseconds a client-side TLS/SSL session should
      be used. The default is 23.5 hours. The value should be smaller
      than the maximum server session duration to allow the client to
      negotiate a new session before the server timeout occurs.
-<li> <code>com.sun.jini.jeri.ssl.sslProtocol</code> - The secure socket
+<li> <code>org.apache.river.jeri.ssl.sslProtocol</code> - The secure socket
      protocol used when obtaining {@link javax.net.ssl.SSLContext}
      instances. The default is <code>"TLS"</code>.
-<li> <code>com.sun.jini.jeri.ssl.trustManagerFactoryAlgorithm</code> -
+<li> <code>org.apache.river.jeri.ssl.trustManagerFactoryAlgorithm</code> -
      The algorithm used when obtaining {@link
      javax.net.ssl.TrustManagerFactory} instances. The default is the
      value returned by {@link
      javax.net.ssl.TrustManagerFactory#getDefaultAlgorithm
      TrustManagerFactory.getDefaultAlgorithm}.
-<li> <code>com.sun.jini.jeri.ssl.cipherSuites</code> - The TLS/SSL
+<li> <code>org.apache.river.jeri.ssl.cipherSuites</code> - The TLS/SSL
      cipher suites that should be used for communication. The default is
      the list of suites supported by the JSSE implementation. The value
      should specify the suite names, separated by commas. The value will
@@ -412,21 +412,21 @@ The following system properties are reco
 only: <p>
 
 <ul>
-<li> <code>com.sun.jini.jeri.https.idleConnectionTimeout</code> - The
+<li> <code>org.apache.river.jeri.https.idleConnectionTimeout</code> - The
      number of milliseconds to retain idle client-side HTTPS connections
      before closing them. The default is <code>15000</code>.
-<li> <code>com.sun.jini.jeri.https.idleServerConnectionTimeout</code> -
+<li> <code>org.apache.river.jeri.https.idleServerConnectionTimeout</code> -
      The number of milliseconds to retain idle server-side HTTPS
      connections before closing them.  The default is the idle
      client-side connection timeout (as specified by the
-     <code>com.sun.jini.jeri.https.idleConnectionTimeout</code> system
+     <code>org.apache.river.jeri.https.idleConnectionTimeout</code> system
      property) plus <code>30000</code>.
-<li> <code>com.sun.jini.jeri.https.responseAckTimeout</code> - The
+<li> <code>org.apache.river.jeri.https.responseAckTimeout</code> - The
      number of milliseconds to wait for acknowledgments from {@link
      net.jini.io.context.AcknowledgmentSource} instances, or to keep
      track of acknowledgements that have not yet been sent. The default
      is <code>15000</code>.
-<li><code>com.sun.jini.jeri.https.pingProxyConnections</code> - If
+<li><code>org.apache.river.jeri.https.pingProxyConnections</code> - If
     the value is case-insensitive equal to <code>true</code>, then if an
     HTTP proxy is being used, ping the server endpoint to verify whether
     it is alive and reachable. The ping occurs before the first request
@@ -439,7 +439,7 @@ only: <p>
     UnmarshalException). The ping increases the likelihood that the
     inability to reach the server endpoint can be explicitly identified.
     The default value is <code>false</code>, and no pings are done.
-<li><code>com.sun.jini.jeri.https.pingProxyConnectionTimeout</code> - The
+<li><code>org.apache.river.jeri.https.pingProxyConnectionTimeout</code> - The
     number of milliseconds from the time a server endpoint was last
     pinged before a ping will precede the next request. The default is
     <code>Long.MAX_VALUE</code> (essentially meaning, ping only before

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,10 +18,10 @@
 
 package net.jini.jeri.tcp;
 
-import com.sun.jini.action.GetBooleanAction;
-import com.sun.jini.jeri.internal.runtime.Util;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.action.GetBooleanAction;
+import org.apache.river.jeri.internal.runtime.Util;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InvalidObjectException;
@@ -102,7 +102,7 @@ public final class TcpEndpoint
     /** whether or not to use NIO-based sockets if possible */
     private static final boolean useNIO =		// default false
 	((Boolean) AccessController.doPrivileged(new GetBooleanAction(
-	    "com.sun.jini.jeri.tcp.useNIO"))).booleanValue();
+	    "org.apache.river.jeri.tcp.useNIO"))).booleanValue();
 
     /**
      * The host that this <code>TcpEndpoint</code> connects to.

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpServerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpServerEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpServerEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpServerEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,12 +18,12 @@
 
 package net.jini.jeri.tcp;
 
-import com.sun.jini.action.GetBooleanAction;
-import com.sun.jini.jeri.internal.runtime.Util;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
-import com.sun.jini.thread.Executor;
-import com.sun.jini.thread.GetThreadPoolAction;
+import org.apache.river.action.GetBooleanAction;
+import org.apache.river.jeri.internal.runtime.Util;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
+import org.apache.river.thread.Executor;
+import org.apache.river.thread.GetThreadPoolAction;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -128,7 +128,7 @@ public final class TcpServerEndpoint imp
     /** whether or not to use NIO-based sockets if possible */
     private static final boolean useNIO =		// default false
 	((Boolean) AccessController.doPrivileged(new GetBooleanAction(
-	    "com.sun.jini.jeri.tcp.useNIO"))).booleanValue();
+	    "org.apache.river.jeri.tcp.useNIO"))).booleanValue();
 
     /** name for local host to fill in to corresponding TcpEndpoints */
     private final String host;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/package.html Sat Jan 15 12:03:35 2011
@@ -110,7 +110,7 @@ are not supported.)
 @since 2.0
 @version 2.0
 
-@com.sun.jini.impl
+@org.apache.river.impl
 
 This implementation uses {@link
 net.jini.jeri.connection.ConnectionManager} and {@link
@@ -128,10 +128,10 @@ various logging levels" border=1 cellpad
 
 <tr> <th> Level <th> Description
 
-<tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED}
+<tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED}
      <td> exceptions thrown attempting to initiate a request
 
-<tr> <td> {@link com.sun.jini.logging.Levels#HANDLED HANDLED}
+<tr> <td> {@link org.apache.river.logging.Levels#HANDLED HANDLED}
      <td> exceptions caught attempting to connect a socket, set
 	  options on a client-side socket, or reuse a connection
 
@@ -153,7 +153,7 @@ various logging levels" border=1 cellpad
 <tr> <td> {@link java.util.logging.Level#WARNING WARNING}
      <td> exceptions accepting on a server socket
 
-<tr> <td> {@link com.sun.jini.logging.Levels#HANDLED HANDLED}
+<tr> <td> {@link org.apache.river.logging.Levels#HANDLED HANDLED}
      <td> exceptions caught setting options on a server-side socket
 
 <tr> <td> {@link java.util.logging.Level#FINE FINE}
@@ -167,7 +167,7 @@ This implementation recognizes the follo
 
 <p><ul>
 
-<li><code>com.sun.jini.jeri.tcp.useNIO</code> - This property is
+<li><code>org.apache.river.jeri.tcp.useNIO</code> - This property is
 interpreted as a <code>boolean</code> value (see {@link
 java.lang.Boolean#getBoolean Boolean.getBoolean}).  If
 <code>true</code>, then when not using a socket factory, the

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpExporter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpExporter.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpExporter.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpExporter.java Sat Jan 15 12:03:35 2011
@@ -82,7 +82,7 @@ import net.jini.export.Exporter;
  * @author	Sun Microsystems, Inc.
  * @since	2.0
  *
- * @com.sun.jini.impl
+ * @org.apache.river.impl
  *
  * <p>This implementation uses the {@link Logger} named
  * <code>net.jini.jrmp.JrmpExporter</code> to log

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpServerContext.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpServerContext.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpServerContext.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpServerContext.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
 
 package net.jini.jrmp;
 
-import com.sun.jini.jeri.internal.runtime.Util;
+import org.apache.river.jeri.internal.runtime.Util;
 import java.net.InetAddress;
 import java.rmi.server.RemoteServer;
 import java.rmi.server.ServerNotActiveException;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassLoader.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassLoader.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassLoader.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
 
 package net.jini.loader.pref;
 
-import com.sun.jini.loader.pref.internal.PreferredResources;
+import org.apache.river.loader.pref.internal.PreferredResources;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.File;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassProvider.java Sat Jan 15 12:03:35 2011
@@ -18,9 +18,9 @@
 
 package net.jini.loader.pref;
 
-import com.sun.jini.action.GetPropertyAction;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.action.GetPropertyAction;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
 import java.io.FilePermission;
 import java.io.IOException;
 import java.lang.ref.ReferenceQueue;
@@ -195,7 +195,7 @@ import net.jini.loader.DownloadPermissio
  * @author Sun Microsystems, Inc.
  * @since 2.0
  *
- * @com.sun.jini.impl
+ * @org.apache.river.impl
  *
  * <p>This implementation uses the {@link Logger} named
  * <code>net.jini.loader.pref.PreferredClassProvider</code> to log

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/Security.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/Security.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/Security.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/Security.java Sat Jan 15 12:03:35 2011
@@ -18,9 +18,9 @@
 
 package net.jini.security;
 
-import com.sun.jini.collection.WeakIdentityMap;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.resource.Service;
+import org.apache.river.collection.WeakIdentityMap;
+import org.apache.river.logging.Levels;
+import org.apache.river.resource.Service;
 import java.lang.ref.SoftReference;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -57,7 +57,7 @@ import net.jini.security.policy.Security
  * verifying codebase integrity, and for dynamically granting permissions.
  * This class cannot be instantiated.
  *
- * @com.sun.jini.impl
+ * @org.apache.river.impl
  * This implementation uses the {@link Logger} named
  * <code>net.jini.security.integrity</code> to log information at
  * the following levels:

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustExporter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustExporter.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustExporter.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustExporter.java Sat Jan 15 12:03:35 2011
@@ -18,8 +18,8 @@
 
 package net.jini.security.proxytrust;
 
-import com.sun.jini.thread.Executor;
-import com.sun.jini.thread.GetThreadPoolAction;
+import org.apache.river.thread.Executor;
+import org.apache.river.thread.GetThreadPoolAction;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
 
 package net.jini.security.proxytrust;
 
-import com.sun.jini.jeri.internal.runtime.Util;
+import org.apache.river.jeri.internal.runtime.Util;
 import java.io.IOException;
 import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustVerifier.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustVerifier.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustVerifier.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustVerifier.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
 
 package net.jini.security.proxytrust;
 
-import com.sun.jini.logging.Levels;
+import org.apache.river.logging.Levels;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -60,7 +60,7 @@ import net.jini.security.TrustVerifier;
  * operation of {@link net.jini.security.Security#verifyObjectTrust
  * Security.verifyObjectTrust}.
  *
- * @com.sun.jini.impl
+ * @org.apache.river.impl
  * This implementation uses the {@link Logger} named
  * <code>net.jini.security.trust</code> to log
  * information at the following levels:

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/Handler.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/Handler.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/Handler.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/Handler.java Sat Jan 15 12:03:35 2011
@@ -18,8 +18,8 @@
 
 package net.jini.url.httpmd;
 
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogManager;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogManager;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
@@ -100,7 +100,7 @@ import java.util.logging.Logger;
  * @see HttpmdUtil
  * @since 2.0
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * This implementation of HTTPMD URLs uses the {@link Logger} named
  * <code>net.jini.url.httpmd</code> to log information at the following logging

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/MdInputStream.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/MdInputStream.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/MdInputStream.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/MdInputStream.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
 
 package net.jini.url.httpmd;
 
-import com.sun.jini.logging.Levels;
+import org.apache.river.logging.Levels;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/package.html Sat Jan 15 12:03:35 2011
@@ -52,7 +52,7 @@ for computing HTTPMD URLs for use in cod
 @since 2.0
 @version 2.0
 
-@com.sun.jini.impl <!-- Implementation Specifics -->
+@org.apache.river.impl <!-- Implementation Specifics -->
 
 This implementation of HTTPMD URLs uses the {@link
 java.util.logging.Logger} named <code>net.jini.url.httpmd</code> to log
@@ -66,12 +66,12 @@ information at the following logging lev
 
 <tr> <th scope="col"> Level <th scope="col"> Description
 
-<tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED} <td> URL
+<tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED} <td> URL
      input stream detects an incorrect message digest
 
 </table> <p>
 
-See the {@link com.sun.jini.logging.LogManager} class for one way to use
+See the {@link org.apache.river.logging.LogManager} class for one way to use
 the <code>FAILED</code> logging level in standard logging configuration
 files.
 

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetBooleanAction.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetBooleanAction.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetBooleanAction.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetBooleanAction.java Sat Jan 15 12:03:35 2011
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package com.sun.jini.action;
+package org.apache.river.action;
 
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.logging.Logger;
@@ -57,7 +57,7 @@ import net.jini.security.Security;
 public class GetBooleanAction implements PrivilegedAction {
 
     private static final Logger logger =
-	Logger.getLogger("com.sun.jini.action.GetBooleanAction");
+	Logger.getLogger("org.apache.river.action.GetBooleanAction");
 
     private final String theProp;
 

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetIntegerAction.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetIntegerAction.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetIntegerAction.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetIntegerAction.java Sat Jan 15 12:03:35 2011
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package com.sun.jini.action;
+package org.apache.river.action;
 
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.logging.Logger;
@@ -74,7 +74,7 @@ import net.jini.security.Security;
 public class GetIntegerAction implements PrivilegedAction {
 
     private static final Logger logger =
-	Logger.getLogger("com.sun.jini.action.GetIntegerAction");
+	Logger.getLogger("org.apache.river.action.GetIntegerAction");
 
     private final String theProp;
     private final int defaultVal;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetLongAction.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetLongAction.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetLongAction.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetLongAction.java Sat Jan 15 12:03:35 2011
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package com.sun.jini.action;
+package org.apache.river.action;
 
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.logging.Logger;
@@ -74,7 +74,7 @@ import net.jini.security.Security;
 public class GetLongAction implements PrivilegedAction {
 
     private static final Logger logger =
-	Logger.getLogger("com.sun.jini.action.GetLongAction");
+	Logger.getLogger("org.apache.river.action.GetLongAction");
 
     private final String theProp;
     private final long defaultVal;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetPropertyAction.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetPropertyAction.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetPropertyAction.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetPropertyAction.java Sat Jan 15 12:03:35 2011
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package com.sun.jini.action;
+package org.apache.river.action;
 
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.logging.Logger;
@@ -58,7 +58,7 @@ import net.jini.security.Security;
 public class GetPropertyAction implements PrivilegedAction {
 
     private static final Logger logger =
-	Logger.getLogger("com.sun.jini.action.GetPropertyAction");
+	Logger.getLogger("org.apache.river.action.GetPropertyAction");
     
     private final String theProp;
     private final String defaultVal;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/SoftCache.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/SoftCache.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/SoftCache.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/SoftCache.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.collection;
+package org.apache.river.collection;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakKeyReference.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakKeyReference.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakKeyReference.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakKeyReference.java Sat Jan 15 12:03:35 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.sun.jini.collection;
+package org.apache.river.collection;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakSoftTable.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakSoftTable.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakSoftTable.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakSoftTable.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.collection;
+package org.apache.river.collection;
 
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakTable.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakTable.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakTable.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakTable.java Sat Jan 15 12:03:35 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.sun.jini.collection;
+package org.apache.river.collection;
 
 import java.io.PrintStream;
 import java.lang.ref.Reference;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/package.html Sat Jan 15 12:03:35 2011
@@ -20,7 +20,7 @@
 <BODY BGCOLOR="white">
 
 Various collection classes used internally by code in
-<CODE>com.sun.jini</CODE> classes.
+<CODE>org.apache.river</CODE> classes.
 
 </BODY>
 </HTML>

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/ConfigUtil.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/ConfigUtil.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/ConfigUtil.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/ConfigUtil.java Sat Jan 15 12:03:35 2011
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.sun.jini.config;
+package org.apache.river.config;
 
 import net.jini.core.lookup.ServiceID;
 import net.jini.id.Uuid;
@@ -34,7 +34,7 @@ public class ConfigUtil {
     /** This class cannot be instantiated. */
     private ConfigUtil() {
 	throw new AssertionError(
-            "com.sun.jini.config.ConfigUtil cannot be instantiated");
+            "org.apache.river.config.ConfigUtil cannot be instantiated");
     }
       
     /**

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/KeyStores.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/KeyStores.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/KeyStores.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/KeyStores.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.config;
+package org.apache.river.config;
 
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientPermissionChecker.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientPermissionChecker.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientPermissionChecker.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientPermissionChecker.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
-import com.sun.jini.collection.SoftCache;
+import org.apache.river.collection.SoftCache;
 import java.security.AccessControlException;
 import java.security.CodeSource;
 import java.security.Permission;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientSubjectChecker.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientSubjectChecker.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientSubjectChecker.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientSubjectChecker.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import javax.security.auth.Subject;
 

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DatagramBufferFactory.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DatagramBufferFactory.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DatagramBufferFactory.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DatagramBufferFactory.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.nio.ByteBuffer;
 

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastAnnouncementDecoder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastAnnouncementDecoder.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastAnnouncementDecoder.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastAnnouncementDecoder.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastRequestDecoder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastRequestDecoder.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastRequestDecoder.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastRequestDecoder.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/Discovery.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/Discovery.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/Discovery.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/Discovery.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -32,8 +32,8 @@ import net.jini.io.UnsupportedConstraint
  * <b><font size="+1">Logging</font></b> <p>
  *
  * This implementation uses the {@link java.util.logging.Logger}s named
- * <code>com.sun.jini.discovery.DiscoveryV1</code> and
- * <code>com.sun.jini.discovery.DiscoveryV2</code> to log information at the
+ * <code>org.apache.river.discovery.DiscoveryV1</code> and
+ * <code>org.apache.river.discovery.DiscoveryV2</code> to log information at the
  * following logging levels: <p>
  *
  * <table border="1" cellpadding="5"
@@ -42,7 +42,7 @@ import net.jini.io.UnsupportedConstraint
  *		   logging levels">
  *
  * <caption halign="center" valign="top"><b><code>
- *	    com.sun.jini.discovery.DiscoveryV1</code></b></caption>
+ *	    org.apache.river.discovery.DiscoveryV1</code></b></caption>
  *
  * <tr> <th scope="col"> Level <th scope="col"> Description
  *
@@ -58,7 +58,7 @@ import net.jini.io.UnsupportedConstraint
  *		   levels">
  *
  * <caption halign="center" valign="top"><b><code>
- *	    com.sun.jini.discovery.DiscoveryV2</code></b></caption>
+ *	    org.apache.river.discovery.DiscoveryV2</code></b></caption>
  *
  * <tr> <th scope="col"> Level <th scope="col"> Description
  *
@@ -67,7 +67,7 @@ import net.jini.io.UnsupportedConstraint
  *	     discovery format providers that are unusable or have conflicting
  *	     discovery format IDs
  *
- * <tr> <td> {@link com.sun.jini.logging.Levels#HANDLED HANDLED}
+ * <tr> <td> {@link org.apache.river.logging.Levels#HANDLED HANDLED}
  *	<td> Constraint check failures encountered during the unicast discovery
  *	     handshake when determining a suitable discovery format to use
  *
@@ -107,7 +107,7 @@ public abstract class Discovery {
      * if the given loader is <code>null</code>.  Available providers are
      * determined by interpreting any resources of the indicated class loader
      * named
-     * <code>"META-INF/services/com.sun.jini.discovery.DiscoveryFormatProvider"</code>
+     * <code>"META-INF/services/org.apache.river.discovery.DiscoveryFormatProvider"</code>
      * as files containing names of provider classes, with one name per line.
      *
      * @param loader class loader from which to load providers, or

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraintTrustVerifier.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraintTrustVerifier.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraintTrustVerifier.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraintTrustVerifier.java Sat Jan 15 12:03:35 2011
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.rmi.RemoteException;
 import net.jini.security.TrustVerifier;
 
 /**
  * Trust verifier for instances of the constraint classes defined in the {@link
- * com.sun.jini.discovery} package.  This class is intended to be specified in
+ * org.apache.river.discovery} package.  This class is intended to be specified in
  * a resource to configure the operation of {@link
  * net.jini.security.Security#verifyObjectTrust Security.verifyObjectTrust}.
  *

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraints.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraints.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraints.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraints.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.lang.reflect.Method;
 import java.util.Collections;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryFormatProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryFormatProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryFormatProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryFormatProvider.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 /**
  * Interface implemented by all discovery format provider classes, which is

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolException.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolException.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolException.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolVersion.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolVersion.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolVersion.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolVersion.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.io.InvalidObjectException;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
-import com.sun.jini.discovery.internal.Plaintext;
+import org.apache.river.discovery.internal.Plaintext;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.DataOutputStream;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV2.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV2.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV2.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV2.java Sat Jan 15 12:03:35 2011
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
-import com.sun.jini.collection.WeakIdentityMap;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.resource.Service;
+import org.apache.river.collection.WeakIdentityMap;
+import org.apache.river.logging.Levels;
+import org.apache.river.resource.Service;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.OutputStream;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/EncodeIterator.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/EncodeIterator.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/EncodeIterator.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/EncodeIterator.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncement.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncement.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncement.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncement.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.util.Arrays;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementDecoder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementDecoder.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementDecoder.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementDecoder.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementEncoder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementEncoder.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementEncoder.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementEncoder.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import net.jini.core.constraint.InvocationConstraints;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastMaxPacketSize.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastMaxPacketSize.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastMaxPacketSize.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastMaxPacketSize.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.io.InvalidObjectException;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequest.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequest.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequest.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequest.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.util.Arrays;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestDecoder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestDecoder.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestDecoder.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestDecoder.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestEncoder.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestEncoder.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestEncoder.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestEncoder.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import net.jini.core.constraint.InvocationConstraints;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastTimeToLive.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastTimeToLive.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastTimeToLive.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastTimeToLive.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.io.InvalidObjectException;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryClient.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryClient.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryClient.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryClient.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.net.Socket;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryServer.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryServer.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryServer.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryServer.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.net.Socket;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastResponse.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastResponse.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastResponse.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastResponse.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.util.Arrays;
 import net.jini.core.lookup.ServiceRegistrar;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastSocketTimeout.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastSocketTimeout.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastSocketTimeout.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastSocketTimeout.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery;
+package org.apache.river.discovery;
 
 import java.io.IOException;
 import java.io.InvalidObjectException;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/BaseProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/BaseProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/BaseProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/BaseProvider.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
-import com.sun.jini.discovery.DiscoveryFormatProvider;
+import org.apache.river.discovery.DiscoveryFormatProvider;
 
 /**
  * Base superclass for discovery format provider implementations.

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java Sat Jan 15 12:03:35 2011
@@ -16,12 +16,12 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
-import com.sun.jini.discovery.UnicastDiscoveryClient;
-import com.sun.jini.discovery.UnicastResponse;
-import com.sun.jini.jeri.internal.connection.ConnManager;
-import com.sun.jini.jeri.internal.connection.ConnManagerFactory;
+import org.apache.river.discovery.UnicastDiscoveryClient;
+import org.apache.river.discovery.UnicastResponse;
+import org.apache.river.jeri.internal.connection.ConnManager;
+import org.apache.river.jeri.internal.connection.ConnManagerFactory;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.IOException;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java Sat Jan 15 12:03:35 2011
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
-import com.sun.jini.discovery.ClientSubjectChecker;
-import com.sun.jini.discovery.DiscoveryProtocolException;
-import com.sun.jini.discovery.UnicastDiscoveryServer;
-import com.sun.jini.discovery.UnicastResponse;
-import com.sun.jini.jeri.internal.connection.ServerConnManager;
+import org.apache.river.discovery.ClientSubjectChecker;
+import org.apache.river.discovery.DiscoveryProtocolException;
+import org.apache.river.discovery.UnicastDiscoveryServer;
+import org.apache.river.discovery.UnicastResponse;
+import org.apache.river.jeri.internal.connection.ServerConnManager;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.DataInputStream;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternals.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternals.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternals.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternals.java Sat Jan 15 12:03:35 2011
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
-import com.sun.jini.jeri.internal.connection.ConnManagerFactory;
-import com.sun.jini.jeri.internal.connection.ServerConnManager;
+import org.apache.river.jeri.internal.connection.ConnManagerFactory;
+import org.apache.river.jeri.internal.connection.ServerConnManager;
 import net.jini.core.constraint.InvocationConstraints;
 import net.jini.jeri.Endpoint;
 import net.jini.jeri.ServerEndpoint;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternalsPermission.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternalsPermission.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternalsPermission.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternalsPermission.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
 import java.security.BasicPermission;
 

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/KerberosEndpointInternalsAccess.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/KerberosEndpointInternalsAccess.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/KerberosEndpointInternalsAccess.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/KerberosEndpointInternalsAccess.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
 import net.jini.jeri.kerberos.KerberosEndpoint;
 

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/MultiIPDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/MultiIPDiscovery.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/MultiIPDiscovery.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/MultiIPDiscovery.java Sat Jan 15 12:03:35 2011
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
-import com.sun.jini.discovery.Discovery;
-import com.sun.jini.discovery.DiscoveryConstraints;
-import com.sun.jini.discovery.UnicastResponse;
+import org.apache.river.discovery.Discovery;
+import org.apache.river.discovery.DiscoveryConstraints;
+import org.apache.river.discovery.UnicastResponse;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/Plaintext.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/Plaintext.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/Plaintext.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/Plaintext.java Sat Jan 15 12:03:35 2011
@@ -16,13 +16,13 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
-import com.sun.jini.discovery.DatagramBufferFactory;
-import com.sun.jini.discovery.DiscoveryProtocolException;
-import com.sun.jini.discovery.MulticastAnnouncement;
-import com.sun.jini.discovery.MulticastRequest;
-import com.sun.jini.discovery.UnicastResponse;
+import org.apache.river.discovery.DatagramBufferFactory;
+import org.apache.river.discovery.DiscoveryProtocolException;
+import org.apache.river.discovery.MulticastAnnouncement;
+import org.apache.river.discovery.MulticastRequest;
+import org.apache.river.discovery.UnicastResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.DataInput;
 import java.io.DataInputStream;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/SslEndpointInternalsAccess.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/SslEndpointInternalsAccess.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/SslEndpointInternalsAccess.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/SslEndpointInternalsAccess.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.discovery.internal;
+package org.apache.river.discovery.internal;
 
 import net.jini.jeri.ssl.SslEndpoint;
 



Mime
View raw message