You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by pe...@apache.org on 2011/01/15 13:03:42 UTC

svn commit: r1059307 [5/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...

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

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/Jeri.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/Jeri.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/Jeri.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/Jeri.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.jeri.internal.runtime;
+package org.apache.river.jeri.internal.runtime;
 
-import com.sun.jini.action.GetLongAction;
+import org.apache.river.action.GetLongAction;
 import java.security.AccessController;
 import net.jini.id.Uuid;
 import net.jini.id.UuidFactory;
@@ -33,13 +33,13 @@ final class Jeri {
     /** duration of DGC leases granted by this runtime */
     static final long leaseValue =			// default 10 minutes
 	((Long) AccessController.doPrivileged(new GetLongAction(
-	    "com.sun.jini.jeri.dgc.leaseValue", 600000)))
+	    "org.apache.river.jeri.dgc.leaseValue", 600000)))
 	    .longValue();
 
     /** period of checking for DGC lease expiration */
     static final long leaseCheckInterval =		// default 5 minutes
 	((Long) AccessController.doPrivileged(new GetLongAction(
-	    "com.sun.jini.jeri.dgc.checkInterval", leaseValue / 2)))
+	    "org.apache.river.jeri.dgc.checkInterval", leaseValue / 2)))
 	    .longValue();
 
     static final int NO_SUCH_OBJECT	= 0x00;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/ObjectTable.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/ObjectTable.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/ObjectTable.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/ObjectTable.java Sat Jan 15 12:03:35 2011
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package com.sun.jini.jeri.internal.runtime;
+package org.apache.river.jeri.internal.runtime;
 
-import com.sun.jini.jeri.internal.runtime.ImplRefManager.ImplRef;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.thread.NewThreadAction;
+import org.apache.river.jeri.internal.runtime.ImplRefManager.ImplRef;
+import org.apache.river.logging.Levels;
+import org.apache.river.thread.NewThreadAction;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.ObjectInputStream;

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SameClassKey.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SameClassKey.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SameClassKey.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SameClassKey.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.jeri.internal.runtime;
+package org.apache.river.jeri.internal.runtime;
 
 /**
  * Wraps collection elements (such as hash table keys) so that two

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SelectionManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SelectionManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SelectionManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SelectionManager.java Sat Jan 15 12:03:35 2011
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-package com.sun.jini.jeri.internal.runtime;
+package org.apache.river.jeri.internal.runtime;
 
-import com.sun.jini.logging.Levels;
-import com.sun.jini.thread.Executor;
-import com.sun.jini.thread.GetThreadPoolAction;
+import org.apache.river.logging.Levels;
+import org.apache.river.thread.Executor;
+import org.apache.river.thread.GetThreadPoolAction;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.CancelledKeyException;
@@ -62,7 +62,7 @@ import java.util.logging.Logger;
  * remainder of a partial message).
  *
  * <p>This implementation uses the {@link Logger} named
- * <code>com.sun.jini.jeri.internal.runtime.SelectionManager</code> to
+ * <code>org.apache.river.jeri.internal.runtime.SelectionManager</code> to
  * log information at the following levels:
  *
  * <p><table summary="Describes what is logged by SelectionManager at
@@ -83,7 +83,7 @@ public final class SelectionManager {
     private static final int concurrency = 1;	// REMIND: get from property?
 
     private static final Logger logger = Logger.getLogger(
-	"com.sun.jini.jeri.internal.runtime.SelectionManager");
+	"org.apache.river.jeri.internal.runtime.SelectionManager");
 
     /** pool of threads for executing tasks in system thread group */
     private static final Executor systemThreadPool = (Executor)

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

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

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

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

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogManager.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.logging;
+package org.apache.river.logging;
 
 import java.io.File;
 import java.io.InputStream;
@@ -35,7 +35,7 @@ import java.util.logging.Logger;
  * logging levels in standard logging configuration files, or to allow changes
  * to the logging configuration file to be noticed. <p>
  *
- * The <code>com.sun.jini.logging.interval</code> logging property (obtained
+ * The <code>org.apache.river.logging.interval</code> logging property (obtained
  * using {@link java.util.logging.LogManager#getProperty
  * LogManager.getProperty}) specifies the time interval in milliseconds
  * between probes to see if the logging configuration file has changed;
@@ -50,13 +50,13 @@ import java.util.logging.Logger;
  * previous probe or if the file has a different modification time. <p>
  *
  * This implementation uses the {@link java.util.logging.Logger} named
- * <code>com.sun.jini.logging.LogManager</code> to log information at the
+ * <code>org.apache.river.logging.LogManager</code> to log information at the
  * following logging levels: <p>
  *
  * <table border="1" cellpadding="5" summary="Describes logging performed
  *	  by the LogManager class at different logging levels">
  * <caption halign="center" valign="top"><b><code>
- * com.sun.jini.logging.LogManager</code></b></caption>
+ * org.apache.river.logging.LogManager</code></b></caption>
  * <tr><th scope="col">Level<th scope="col">Description
  * <tr><td>{@link Level#WARNING WARNING}<td>if an exception occurs while
  * rereading the logging configuration file
@@ -99,7 +99,7 @@ public class LogManager extends java.uti
 
     /** Return the probe interval. */
     private long getInterval() {
-	String val = getProperty("com.sun.jini.logging.interval");
+	String val = getProperty("org.apache.river.logging.interval");
 	if (val != null) {
 	    try {
 		return Long.decode(val).longValue();
@@ -139,7 +139,7 @@ public class LogManager extends java.uti
 
 	public void run() {
 	    Logger logger =
-		Logger.getLogger("com.sun.jini.logging.LogManager");
+		Logger.getLogger("org.apache.river.logging.LogManager");
 	    try {
 		while (interval > 0) {
 		    Thread.sleep(interval);

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogUtil.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogUtil.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogUtil.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogUtil.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.logging;
+package org.apache.river.logging;
 
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -33,7 +33,7 @@ public class LogUtil {
     /** This class cannot be instantiated. */
     private LogUtil() {
         throw new AssertionError(
-            "com.sun.jini.logging.LogUtil cannot be instantiated");
+            "org.apache.river.logging.LogUtil cannot be instantiated");
     }    
     
     /**

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

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/resource/ServiceConfigurationError.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/resource/ServiceConfigurationError.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/resource/ServiceConfigurationError.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/resource/ServiceConfigurationError.java Sat Jan 15 12:03:35 2011
@@ -17,7 +17,7 @@
  */
 
 
-package com.sun.jini.resource;
+package org.apache.river.resource;
 
 /**
  * Error thrown when something goes wrong while looking up service providers.

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/Executor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/Executor.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/Executor.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/Executor.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.thread;
+package org.apache.river.thread;
 
 /**
  * Executor is an abstraction for a thread factory or thread pool for

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

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

Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/ThreadPool.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/ThreadPool.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/ThreadPool.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/ThreadPool.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.thread;
+package org.apache.river.thread;
 
-import com.sun.jini.action.GetLongAction;
+import org.apache.river.action.GetLongAction;
 import java.security.AccessController;
 import java.util.LinkedList;
 import java.util.logging.Level;
@@ -41,7 +41,7 @@ import java.util.logging.Logger;
  * idle.
  *
  * <p>This implementation uses the {@link Logger} named
- * <code>com.sun.jini.thread.ThreadPool</code> to
+ * <code>org.apache.river.thread.ThreadPool</code> to
  * log information at the following levels:
  *
  * <p><table summary="Describes what is logged by ThreadPool at
@@ -61,11 +61,11 @@ final class ThreadPool implements Execut
     /** how long a thread waits in the idle state before passing away */
     private static final long idleTimeout =		// default 5 minutes
 	((Long) AccessController.doPrivileged(new GetLongAction(
-	    "com.sun.jini.thread.idleThreadTimeout", 300000)))
+	    "org.apache.river.thread.idleThreadTimeout", 300000)))
 	    .longValue();
 
     private static final Logger logger =
-	Logger.getLogger("com.sun.jini.thread.ThreadPool");
+	Logger.getLogger("org.apache.river.thread.ThreadPool");
 
     /** thread group that this pool's threads execute in */
     private final ThreadGroup threadGroup;

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

Modified: incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/GrantPermission.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/GrantPermission.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/GrantPermission.java (original)
+++ incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/GrantPermission.java Sat Jan 15 12:03:35 2011
@@ -604,7 +604,7 @@ public final class GrantPermission exten
     /**
      * Returns quoted string literal that, if parsed by
      * java.io.StreamTokenizer, would yield the given string.  This method is
-     * essentially a copy of com.sun.jini.config.ConfigUtil.stringLiteral; the
+     * essentially a copy of org.apache.river.config.ConfigUtil.stringLiteral; the
      * two methods are kept separate since ConfigUtil.stringLiteral could
      * conceivably escape unicode characters, while such escaping would be
      * incorrect for GrantPermission.

Modified: incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/DynamicPolicyProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/DynamicPolicyProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/DynamicPolicyProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/DynamicPolicyProvider.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
 
 package net.jini.security.policy;
 
-import com.sun.jini.collection.WeakIdentityMap;
+import org.apache.river.collection.WeakIdentityMap;
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.security.AccessController;

Modified: incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/PolicyFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/PolicyFileProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/PolicyFileProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/PolicyFileProvider.java Sat Jan 15 12:03:35 2011
@@ -44,7 +44,7 @@ import net.jini.security.GrantPermission
  * @author Sun Microsystems, Inc.
  * @since 2.0
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * This implementation's no-argument constructor uses a default class name of
  * <code>"sun.security.provider.PolicyFile"</code> to instantiate base policy

Modified: incubator/river/jtsk/skunk/modules/river-policy/src/main/java/org/apache/river/collection/WeakIdentityMap.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-policy/src/main/java/org/apache/river/collection/WeakIdentityMap.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-policy/src/main/java/org/apache/river/collection/WeakIdentityMap.java (original)
+++ incubator/river/jtsk/skunk/modules/river-policy/src/main/java/org/apache/river/collection/WeakIdentityMap.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.WeakReference;

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ActivateWrapper.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ActivateWrapper.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ActivateWrapper.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ActivateWrapper.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.start;
+package org.apache.river.start;
 
 import net.jini.export.ProxyAccessor;
 import net.jini.id.Uuid;
@@ -72,9 +72,9 @@ import java.util.logging.Logger;
  * This wrapper class performs a security check to control what 
  * policy files can be used with a given codebase. 
  * It does this by querying the VM's (global) policy for 
- * {@link com.sun.jini.start.SharedActivationPolicyPermission} 
+ * {@link org.apache.river.start.SharedActivationPolicyPermission} 
  * grants. The service's associated 
- * {@link com.sun.jini.start.ActivateWrapper.ActivateDesc#importLocation
+ * {@link org.apache.river.start.ActivateWrapper.ActivateDesc#importLocation
  * ActivateDesc.importLocation} is used as 
  * the {@link java.security.CodeSource}
  * for selecting the appropriate permission set to 
@@ -120,13 +120,13 @@ import java.util.logging.Logger;
  * supports the
  * following {@link java.security.Security} property:
  *
- *   <table summary="Describes the com.sun.jini.start.servicePolicyProvider
+ *   <table summary="Describes the org.apache.river.start.servicePolicyProvider
  *          security property"
  *          border="0" cellpadding="2">
  *     <tr valign="top">
  *       <th scope="col" summary="layout"> <font size="+1">&#X2022;</font>
  *       <th scope="col" align="left" colspan="2"> <font size="+1"><code>
- *       com.sun.jini.start.servicePolicyProvider</code></font>
+ *       org.apache.river.start.servicePolicyProvider</code></font>
  *     <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *       Default: <td> <code>
  *         "net.jini.security.policy.DynamicPolicyProvider"
@@ -152,7 +152,7 @@ import java.util.logging.Logger;
  *       <P>
  *       A custom service policy provider can be very useful when trying to
  *       debug security related issues.
- *       <code>com.sun.jini.tool.DebugDynamicPolicyProvider</code> is an example
+ *       <code>org.apache.river.tool.DebugDynamicPolicyProvider</code> is an example
  *       policy provider that provides this functionality and can be located
  *       via the following URL:
  *       <A HREF="http://starterkit-examples.jini.org/">
@@ -164,7 +164,7 @@ import java.util.logging.Logger;
  *       {@link java.security.AllPermission}.
  *   </table>
  *
- * @see com.sun.jini.start.SharedActivationPolicyPermission
+ * @see org.apache.river.start.SharedActivationPolicyPermission
  * @see java.rmi.activation.ActivationID
  * @see java.rmi.MarshalledObject
  * @see java.rmi.Remote
@@ -178,7 +178,7 @@ import java.util.logging.Logger;
 public class ActivateWrapper implements Remote, Serializable {
 
     /** Configure logger */
-    static final Logger logger = Logger.getLogger("com.sun.jini.start.wrapper");
+    static final Logger logger = Logger.getLogger("org.apache.river.start.wrapper");
     /**
      * The <code>Policy</code> object that aggregates the individual 
      * service policy objects.
@@ -211,7 +211,7 @@ public class ActivateWrapper implements 
 	    new PrivilegedAction() {
 		public Object run() {
 		    return Security.getProperty(
-			    "com.sun.jini.start." +
+			    "org.apache.river.start." +
 			    "servicePolicyProvider");
 		}
 	    }));
@@ -380,10 +380,10 @@ public class ActivateWrapper implements 
      * @param id The <code>ActivationID</code> of this object
      * @param data The activation data for this object
      *
-     * @see com.sun.jini.start.ActivateWrapper.ExportClassLoader
-     * @see com.sun.jini.start.ActivateWrapper.ActivateDesc
-     * @see com.sun.jini.start.AggregatePolicyProvider
-     * @see com.sun.jini.start.SharedActivationPolicyPermission
+     * @see org.apache.river.start.ActivateWrapper.ExportClassLoader
+     * @see org.apache.river.start.ActivateWrapper.ActivateDesc
+     * @see org.apache.river.start.AggregatePolicyProvider
+     * @see org.apache.river.start.SharedActivationPolicyPermission
      * @see java.security.Policy
      *
      */

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/AggregatePolicyProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/AggregatePolicyProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/AggregatePolicyProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/AggregatePolicyProvider.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.start;
+package org.apache.river.start;
 
-import com.sun.jini.collection.WeakIdentityMap;
+import org.apache.river.collection.WeakIdentityMap;
 import java.lang.reflect.Method;
 import java.security.AccessControlContext;
 import java.security.AccessController;
@@ -72,7 +72,7 @@ public class AggregatePolicyProvider 
     extends Policy implements DynamicPolicy, SecurityContextSource
 {
     private static final String mainPolicyClassProperty =
-	"com.sun.jini.start.AggregatePolicyProvider.mainPolicyClass";
+	"org.apache.river.start.AggregatePolicyProvider.mainPolicyClass";
     private static final String defaultMainPolicyClass =
 	"net.jini.security.policy.DynamicPolicyProvider";
 
@@ -91,7 +91,7 @@ public class AggregatePolicyProvider 
     /**
      * Creates a new <code>AggregatePolicyProvider</code> instance, containing
      * a main policy created as follows: if the
-     * <code>com.sun.jini.start.AggregatePolicyProvider.mainPolicyClass</code>
+     * <code>org.apache.river.start.AggregatePolicyProvider.mainPolicyClass</code>
      * security property is set, then its value is interpreted as the class
      * name of the main policy provider; otherwise, a default class name of
      * <code>"net.jini.security.policy.DynamicPolicyProvider"</code>
@@ -103,7 +103,7 @@ public class AggregatePolicyProvider 
      * <p>
      * Note that this constructor requires the appropriate
      * <code>"getProperty"</code> {@link SecurityPermission} to read the
-     * <code>com.sun.jini.start.AggregatePolicyProvider.mainPolicyClass</code>
+     * <code>org.apache.river.start.AggregatePolicyProvider.mainPolicyClass</code>
      * security property, and may require <code>"accessClassInPackage.*"</code>
      * {@link RuntimePermission}s, depending on the package of the main policy
      * class.
@@ -113,7 +113,7 @@ public class AggregatePolicyProvider 
      * @throws  SecurityException if there is a security manager and the
      *          calling context does not have <code>SecurityPermission</code>
      *          for reading the
-     *          <code>com.sun.jini.start.AggregatePolicyProvider.mainPolicy</code>
+     *          <code>org.apache.river.start.AggregatePolicyProvider.mainPolicy</code>
      *          security property, or if the calling context does not have
      *          adequate permissions to access the main policy class
      */

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ClassLoaderUtil.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ClassLoaderUtil.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ClassLoaderUtil.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ClassLoaderUtil.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.start;
+package org.apache.river.start;
 
 import java.io.File;
 import java.io.IOException;
@@ -41,7 +41,7 @@ import java.util.StringTokenizer;
 public class ClassLoaderUtil {
     /** Configure logger */
     static final Logger logger = 
-        Logger.getLogger("com.sun.jini.start.ClassLoaderUtil");
+        Logger.getLogger("org.apache.river.start.ClassLoaderUtil");
     
     // Private constructor to prevent instantiation
     private ClassLoaderUtil() { }

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

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/LoaderSplitPolicyProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/LoaderSplitPolicyProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/LoaderSplitPolicyProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/LoaderSplitPolicyProvider.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.start;
+package org.apache.river.start;
 
-import com.sun.jini.collection.WeakIdentityMap;
+import org.apache.river.collection.WeakIdentityMap;
 import net.jini.security.policy.DynamicPolicy;
 import java.security.AccessController;
 import java.security.AllPermission;

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.start;
+package org.apache.river.start;
 
-import com.sun.jini.config.Config;
+import org.apache.river.config.Config;
 
 import net.jini.config.Configuration;
 import net.jini.export.ProxyAccessor;
@@ -110,7 +110,7 @@ import java.util.logging.Logger;
  * {@link net.jini.config.Configuration Configuration} object passed into 
  * the {@link #create(net.jini.config.Configuration) create} method.
  * The following configuration entries use the
- * component prefix "<code>com.sun.jini.start</code>": <p>
+ * component prefix "<code>org.apache.river.start</code>": <p>
  *
  * <a name="servicePreparer">
  * <table summary="Describes the default service preparer configuration entry"
@@ -145,7 +145,7 @@ import java.util.logging.Logger;
  *
  * This implementation uses the {@link
  * java.util.logging.Logger}, named 
- * <code>com.sun.jini.start.service.starter</code>. 
+ * <code>org.apache.river.start.service.starter</code>. 
  * The following table describes the
  * type of information logged as well as the levels of information logged.
  * <p>
@@ -155,7 +155,7 @@ import java.util.logging.Logger;
  *       service descriptor at different logging levels">
  *
  *  <caption halign="center" valign="top"><b><code>
- *	   com.sun.jini.start.service.starter</code></b></caption>
+ *	   org.apache.river.start.service.starter</code></b></caption>
  *
  *  <tr> <th scope="col"> Level <th scope="col"> Description
  *
@@ -362,7 +362,7 @@ public class NonActivatableServiceDescri
 
     /**
      * Convenience constructor. Equivalent to calling this 
-     * {@link #NonActivatableServiceDescriptor(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String[], com.sun.jini.start.LifeCycle, net.jini.security.ProxyPreparer) contructor}
+     * {@link #NonActivatableServiceDescriptor(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String[], org.apache.river.start.LifeCycle, net.jini.security.ProxyPreparer) contructor}
      * with <code>null</code> for the <code>preparer</code> 
      * reference.
      */    
@@ -382,7 +382,7 @@ public class NonActivatableServiceDescri
     
     /**
      * Convenience constructor. Equivalent to calling this 
-     * {@link #NonActivatableServiceDescriptor(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String[], com.sun.jini.start.LifeCycle, net.jini.security.ProxyPreparer) contructor}
+     * {@link #NonActivatableServiceDescriptor(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String[], org.apache.river.start.LifeCycle, net.jini.security.ProxyPreparer) contructor}
      * with <code>null</code> for the <code>lifeCycle</code> and <code>preparer</code> 
      * references.
      */
@@ -400,7 +400,7 @@ public class NonActivatableServiceDescri
     }
     /**
      * Convenience constructor. Equivalent to calling this 
-     * {@link #NonActivatableServiceDescriptor(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String[], com.sun.jini.start.LifeCycle, net.jini.security.ProxyPreparer) contructor}
+     * {@link #NonActivatableServiceDescriptor(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String[], org.apache.river.start.LifeCycle, net.jini.security.ProxyPreparer) contructor}
      * with <code>null</code> for the <code>lifeCycle</code>
      * reference.
      */
@@ -557,7 +557,7 @@ public class NonActivatableServiceDescri
      * </UL>
      *
      * @return a 
-     * {@link com.sun.jini.start.NonActivatableServiceDescriptor.Created
+     * {@link org.apache.river.start.NonActivatableServiceDescriptor.Created
      * Created} instance with the service's proxy and implementation
      * references.
      * @throws java.lang.Exception Thrown if there was any problem 

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceDescriptor.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceDescriptor.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceDescriptor.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.start;
+package org.apache.river.start;
 import net.jini.config.Configuration;
 
 /**

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceStarter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceStarter.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceStarter.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceStarter.java Sat Jan 15 12:03:35 2011
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-package com.sun.jini.start;
+package org.apache.river.start;
 
-import com.sun.jini.config.Config;
+import org.apache.river.config.Config;
 
 import net.jini.config.Configuration;
 import net.jini.config.ConfigurationException;
@@ -41,7 +41,7 @@ import javax.security.auth.login.LoginCo
 import javax.security.auth.login.LoginException;
 import javax.security.auth.Subject;
 
-import com.sun.jini.action.GetIntegerAction;
+import org.apache.river.action.GetIntegerAction;
 
 /** 
  * This class provides the main routine for starting shared groups,
@@ -59,7 +59,7 @@ import com.sun.jini.action.GetIntegerAct
  *
  * This implementation of <code>ServiceStarter</code> supports the
  * following configuration entries, with component
- * <code>com.sun.jini.start</code>:
+ * <code>org.apache.river.start</code>:
  *
  *   <table summary="Describes the loginContext configuration entry"
  *     border="0" cellpadding="2">
@@ -99,7 +99,7 @@ import com.sun.jini.action.GetIntegerAct
  *
  *The implementation uses the {@link
  *java.util.logging.Logger}, named 
- *<code>com.sun.jini.start.service.starter</code>. 
+ *<code>org.apache.river.start.service.starter</code>. 
  *The following table describes the
  *type of information logged as well as the levels of information logged.
  *<p>
@@ -109,7 +109,7 @@ import com.sun.jini.action.GetIntegerAct
  *	 logging levels">
  *
  *  <caption halign="center" valign="top"><b><code>
- *	   com.sun.jini.start.service.starter</code></b></caption>
+ *	   org.apache.river.start.service.starter</code></b></caption>
  *
  *  <tr> <th scope="col"> Level <th scope="col"> Description
  *
@@ -134,7 +134,7 @@ import com.sun.jini.action.GetIntegerAct
 public class ServiceStarter {
 
     /** Component name for service starter configuration entries */
-    static final String START_PACKAGE = "com.sun.jini.start";
+    static final String START_PACKAGE = "org.apache.river.start";
     
    
     /** Configure logger */
@@ -453,7 +453,7 @@ public class ServiceStarter {
      * <code>ConfigurationProvider.getInstance()</code> in order to 
      * obtain a <code>Configuration</code> object. This configuration 
      * object is then queried for the 
-     * <code>com.sun.jini.start.serviceDescriptors</code> entry, which
+     * <code>org.apache.river.start.serviceDescriptors</code> entry, which
      * is assumed to be a <code>ServiceDescriptor[]</code>.
      * The <code>create()</code> method is then called on each of the array
      * elements.
@@ -486,7 +486,7 @@ public class ServiceStarter {
     /**
      * The main method for embidding the <code>ServiceStarter</code> application.
      * The <code>config</code> argument is queried for the
-     * <code>com.sun.jini.start.serviceDescriptors</code> entry, which
+     * <code>org.apache.river.start.serviceDescriptors</code> entry, which
      * is assumed to be a <code>ServiceDescriptor[]</code>.
      * The <code>create()</code> method is then called on each of the array
      * elements.

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivatableServiceDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivatableServiceDescriptor.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivatableServiceDescriptor.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivatableServiceDescriptor.java Sat Jan 15 12:03:35 2011
@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.sun.jini.start;
+package org.apache.river.start;
 
-import com.sun.jini.config.Config;
+import org.apache.river.config.Config;
 
 import net.jini.config.Configuration;
 import net.jini.security.BasicProxyPreparer;
@@ -122,7 +122,7 @@ import java.util.logging.Logger;
  * {@link net.jini.config.Configuration Configuration} object passed into 
  * the {@link #create(net.jini.config.Configuration) create} method.
  * The following configuration entries use the
- * component prefix "<code>com.sun.jini.start</code>": 
+ * component prefix "<code>org.apache.river.start</code>": 
  * <p>
  *
  *   <table summary="Describes the activationIdPreparer configuration entry"
@@ -205,7 +205,7 @@ import java.util.logging.Logger;
  *
  * The implementation uses the {@link
  * java.util.logging.Logger}, named 
- * <code>com.sun.jini.start.service.starter</code>. 
+ * <code>org.apache.river.start.service.starter</code>. 
  * The following table describes the
  * type of information logged as well as the levels of information logged.
  * <p>
@@ -216,7 +216,7 @@ import java.util.logging.Logger;
  *	 logging levels">
  *
  *  <caption halign="center" valign="top"><b><code>
- *	   com.sun.jini.start.service.starter</code></b></caption>
+ *	   org.apache.river.start.service.starter</code></b></caption>
  *
  *  <tr> <th scope="col"> Level <th scope="col"> Description
  *
@@ -532,7 +532,7 @@ public class SharedActivatableServiceDes
      *      {@linkplain java.rmi.activation.ActivationGroupID group identifier}
      *      associated with the provided shared group log.
      * <LI> invokes 
-     *      {@link ActivateWrapper#register(java.rmi.activation.ActivationGroupID, com.sun.jini.start.ActivateWrapper.ActivateDesc, boolean, java.rmi.activation.ActivationSystem)
+     *      {@link ActivateWrapper#register(java.rmi.activation.ActivationGroupID, org.apache.river.start.ActivateWrapper.ActivateDesc, boolean, java.rmi.activation.ActivationSystem)
      *      ActivateWrapper.register()} with the provided information.
      * <LI> obtains an <A HREF="#innerProxy">inner proxy</A> by calling 
      *      {@link java.rmi.activation.ActivationID#activate(boolean)
@@ -552,7 +552,7 @@ public class SharedActivatableServiceDes
      * </UL>
      *
      * @return a 
-     *      {@link com.sun.jini.start.SharedActivatableServiceDescriptor.Created
+     *      {@link org.apache.river.start.SharedActivatableServiceDescriptor.Created
      *      Created} object that contains the group identifier, activation ID, and
      *      proxy associated with the newly created service instance.
      * @throws java.lang.Exception Thrown if there was any problem 

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

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivationPolicyPermission.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivationPolicyPermission.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivationPolicyPermission.java (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivationPolicyPermission.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.start;
+package org.apache.river.start;
 
 import java.io.File;
 import java.io.FilePermission;
@@ -31,7 +31,7 @@ import java.util.Enumeration;
 
 /**
  * {@link Permission} class used by the 
- * {@linkplain com.sun.jini.start service starter} 
+ * {@linkplain org.apache.river.start service starter} 
  * package. This class takes a policy string argument that follows the 
  * matching semantics defined by {@link FilePermission}. The 
  * {@link ActivateWrapper} class explicitly checks to see if the service's
@@ -41,7 +41,7 @@ import java.util.Enumeration;
  * An example grant is:
  * <blockquote><pre>
  * grant codebase "file:<VAR><B>install_dir</B></VAR>/lib/fiddler.jar" {
- *     permission com.sun.jini.start.SharedActivationPolicyPermission 
+ *     permission org.apache.river.start.SharedActivationPolicyPermission 
  *         "<VAR><B>policy_dir</B></VAR>${/}policy.fiddler";
  * };
  * </pre></blockquote>

Modified: incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/package.html Sat Jan 15 12:03:35 2011
@@ -48,7 +48,7 @@ the contributed services in the followin
      platform (VM) environment.
      <P>
      Shared activatable services are created via 
-     {@link com.sun.jini.start.SharedActivatableServiceDescriptor} entries
+     {@link org.apache.river.start.SharedActivatableServiceDescriptor} entries
      in service starter's configuration.
      <P>
 <DT> <B>Shared, Non-Activatable</B>
@@ -59,7 +59,7 @@ the contributed services in the followin
      while still sharing a single VM environment.     
      <P>
      Shared non-activatable services are created via 
-     {@link com.sun.jini.start.NonActivatableServiceDescriptor} entries
+     {@link org.apache.river.start.NonActivatableServiceDescriptor} entries
      in service starter's configuration.
      <P>
 </DL>     
@@ -96,21 +96,21 @@ Linux</a>, and 
 Windows</a>.
 <P>
 The command line, above, will invoke 
-{@link com.sun.jini.start.ServiceStarter#main(java.lang.String[]) ServiceStarter.main()},
+{@link org.apache.river.start.ServiceStarter#main(java.lang.String[]) ServiceStarter.main()},
 which obtains a 
-{@link com.sun.jini.start.ServiceDescriptor ServiceDescriptor[]} from its
+{@link org.apache.river.start.ServiceDescriptor ServiceDescriptor[]} from its
 <code>Configuration</code> 
-(via the <code>com.sun.jini.start.serviceDescriptors</code> entry)
+(via the <code>org.apache.river.start.serviceDescriptors</code> entry)
 and invokes <code>create()</code> on each array
 element. The three provided implementations of <code>ServiceDescriptor</code> 
 are:
 <DL>
-<DT>{@link com.sun.jini.start.NonActivatableServiceDescriptor}
+<DT>{@link org.apache.river.start.NonActivatableServiceDescriptor}
 <DD>Used to create a server for in-process execution. That is,
     the server will run in a shared, non-activatable mode within 
     the invoking VM.
     <P>
-<DT>{@link com.sun.jini.start.SharedActivationGroupDescriptor}
+<DT>{@link org.apache.river.start.SharedActivationGroupDescriptor}
 <DD>Used to create an <A HREF="#activation">activation system</A> group
     (or VM),
     which can then be used to host shared, activatable servers. Group 
@@ -119,7 +119,7 @@ are:
     <code>SharedActivationGroupDescriptor</code>'s constructor. This
     log directory can then be specified as the 
     <code>sharedGroupLog</code> argument in 
-    {@link com.sun.jini.start.SharedActivatableServiceDescriptor}'s 
+    {@link org.apache.river.start.SharedActivatableServiceDescriptor}'s 
     constructor in order
     to associate the server with a particular activation system group.
     <P>
@@ -128,7 +128,7 @@ are:
     must be created before it can be referenced by 
     subsequent <code>SharedActivatableServiceDescriptor</code> entries.
     <P>
-<DT>{@link com.sun.jini.start.SharedActivatableServiceDescriptor}
+<DT>{@link org.apache.river.start.SharedActivatableServiceDescriptor}
 <DD>Used to create a server for shared, activation execution. That is,
     the service will be hosted in an activation system group identified by
     the <code>sharedGroupLog</code> constructor argument. 
@@ -145,19 +145,19 @@ one or more shared groups:
 </pre></blockquote>
 <P>
 The command line, above, will invoke 
-{@link com.sun.jini.start.DestroySharedGroup#main(java.lang.String[]) 
+{@link org.apache.river.start.DestroySharedGroup#main(java.lang.String[]) 
 DestroySharedGroup.main()},
 which obtains a 
-{@link com.sun.jini.start.ServiceDescriptor ServiceDescriptor[]} from its
+{@link org.apache.river.start.ServiceDescriptor ServiceDescriptor[]} from its
 <code>Configuration</code> 
-(via the <code>com.sun.jini.start.serviceDestructors</code> entry) 
+(via the <code>org.apache.river.start.serviceDestructors</code> entry) 
 and invokes <code>create()</code> on each array
 element. All the array elements are assumed to be 
 <code>SharedActivatableServiceDescriptor</code>s that are configured to
-run {@link com.sun.jini.start.SharedGroup} implementations 
-(see provided implementation: {@link com.sun.jini.start.SharedGroupImpl}).
+run {@link org.apache.river.start.SharedGroup} implementations 
+(see provided implementation: {@link org.apache.river.start.SharedGroupImpl}).
 Once created, each element's 
-{@link com.sun.jini.start.SharedGroup#destroyVM() destroyVM()}
+{@link org.apache.river.start.SharedGroup#destroyVM() destroyVM()}
 method will be invoked and its associated group log will be deleted.
 <P>
 <em>Notes:</em> Group destruction:
@@ -173,7 +173,7 @@ servers associated with the group being 
 Users need to explicity destroy the
 individual servers prior to destroying the group, if desired. This can be
 done for the provided services by invoking the 
-{@link com.sun.jini.admin.DestroyAdmin#destroy() DestroyAdmin.destroy()} 
+{@link org.apache.river.admin.DestroyAdmin#destroy() DestroyAdmin.destroy()} 
 method on the server's {@link net.jini.admin.Administrable} object (obtained
 by invoking 
 {@link net.jini.admin.Administrable#getAdmin() Administrable.getAdmin()}
@@ -215,7 +215,7 @@ The examples below make the following as
      <var><b>your_host</b></var> and is available on port
      <var><b>http_port</b></var>. This HTTP server is serving files located
      in the <var><b>install_dir</b></var>/lib-dl directory. The
-     {@link com.sun.jini.tool.ClassServer} class is used 
+     {@link org.apache.river.tool.ClassServer} class is used 
      for this purpose in the following examples.
 <li> The examples are being run on UNIX platforms
 <li> The examples are being run on a secure network where access control
@@ -224,7 +224,7 @@ The examples below make the following as
      client and service configurations that enforce security.
 <li> For activatable services, an activation system is running on
      <var><b>your_host</b></var>. You can use the {@link
-     com.sun.jini.phoenix} implementation for this purpose.
+     org.apache.river.phoenix} implementation for this purpose.
 </ul> 
 <p>
 
@@ -282,10 +282,10 @@ by the command line above. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/start-transient-jeri-services.config -->
-import com.sun.jini.start.NonActivatableServiceDescriptor;
-import com.sun.jini.start.ServiceDescriptor;
+import org.apache.river.start.NonActivatableServiceDescriptor;
+import org.apache.river.start.ServiceDescriptor;
 
-com.sun.jini.start {
+org.apache.river.start {
 
     //
     // HTTPD Service
@@ -293,7 +293,7 @@ com.sun.jini.start {
     private static httpd_codebase = "";
     private static httpd_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static httpd_classpath = "<var><b>install_dir</b></var>/lib/classserver.jar";
-    private static httpd_impl = "com.sun.jini.tool.ClassServer";
+    private static httpd_impl = "org.apache.river.tool.ClassServer";
     private static httpd_service = 
         new NonActivatableServiceDescriptor(
             httpd_codebase, httpd_policy, httpd_classpath, httpd_impl,
@@ -307,7 +307,7 @@ com.sun.jini.start {
     private static fiddler_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static fiddler_classpath = "<var><b>install_dir</b></var>/lib/fiddler.jar";
     private static fiddler_config = "<a href="#transient_fiddler_config"><var><b>config_dir</b></var>/transient-fiddler.config</a>";
-    private static fiddler_impl = "com.sun.jini.fiddler.TransientFiddlerImpl";
+    private static fiddler_impl = "org.apache.river.fiddler.TransientFiddlerImpl";
     private static fiddler_service = 
         new NonActivatableServiceDescriptor(
             fiddler_codebase, fiddler_policy, fiddler_classpath, 
@@ -321,7 +321,7 @@ com.sun.jini.start {
     private static mahalo_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static mahalo_classpath = "<var><b>install_dir</b></var>/lib/mahalo.jar";
     private static mahalo_config = "<a href="#transient_mahalo_config"><var><b>config_dir</b></var>/transient-mahalo.config</a>";
-    private static mahalo_impl = "com.sun.jini.mahalo.TransientMahaloImpl";
+    private static mahalo_impl = "org.apache.river.mahalo.TransientMahaloImpl";
     private static mahalo_service = 
         new NonActivatableServiceDescriptor(
             mahalo_codebase, mahalo_policy, mahalo_classpath, 
@@ -335,7 +335,7 @@ com.sun.jini.start {
     private static mercury_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static mercury_classpath = "<var><b>install_dir</b></var>/lib/mercury.jar";
     private static mercury_config = "<a href="#transient_mercury_config"><var><b>config_dir</b></var>/transient-mercury.config</a>";
-    private static mercury_impl = "com.sun.jini.mercury.TransientMercuryImpl";
+    private static mercury_impl = "org.apache.river.mercury.TransientMercuryImpl";
     private static mercury_service = 
         new NonActivatableServiceDescriptor(
             mercury_codebase, mercury_policy, mercury_classpath, 
@@ -349,7 +349,7 @@ com.sun.jini.start {
     private static norm_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static norm_classpath = "<var><b>install_dir</b></var>/lib/norm.jar";
     private static norm_config = "<a href="#transient_norm_config"><var><b>config_dir</b></var>/transient-norm.config</a>";
-    private static norm_impl = "com.sun.jini.norm.TransientNormServerImpl";
+    private static norm_impl = "org.apache.river.norm.TransientNormServerImpl";
     private static norm_service = 
         new NonActivatableServiceDescriptor(
             norm_codebase, norm_policy, norm_classpath, 
@@ -363,7 +363,7 @@ com.sun.jini.start {
     private static outrigger_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static outrigger_classpath = "<var><b>install_dir</b></var>/lib/outrigger.jar";
     private static outrigger_config = "<a href="#transient_outrigger_config"><var><b>config_dir</b></var>/transient-outrigger.config</a>";
-    private static outrigger_impl = "com.sun.jini.outrigger.TransientOutriggerImpl";
+    private static outrigger_impl = "org.apache.river.outrigger.TransientOutriggerImpl";
     private static outrigger_service = 
         new NonActivatableServiceDescriptor(
             outrigger_codebase, outrigger_policy, outrigger_classpath, 
@@ -377,7 +377,7 @@ com.sun.jini.start {
     private static reggie_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static reggie_classpath = "<var><b>install_dir</b></var>/lib/reggie.jar";
     private static reggie_config = "<a href="#transient_reggie_config"><var><b>config_dir</b></var>/transient-reggie.config</a>";
-    private static reggie_impl = "com.sun.jini.reggie.TransientRegistrarImpl";
+    private static reggie_impl = "org.apache.river.reggie.TransientRegistrarImpl";
     private static reggie_service = 
         new NonActivatableServiceDescriptor(
             reggie_codebase, reggie_policy, reggie_classpath, 
@@ -407,7 +407,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/transient-fiddler.config -->
-com.sun.jini.fiddler {
+org.apache.river.fiddler {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
 }
 <!-- cut_end -->
@@ -424,7 +424,7 @@ ERI protocol. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/transient-mahalo.config -->
-com.sun.jini.mahalo {
+org.apache.river.mahalo {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
 }
 <!-- cut_end -->
@@ -441,7 +441,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/transient-mercury.config -->
-com.sun.jini.mercury {
+org.apache.river.mercury {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
 }
 <!-- cut_end -->
@@ -458,7 +458,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/transient-norm.config -->
-com.sun.jini.norm {
+org.apache.river.norm {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
 }
 <!-- cut_end -->
@@ -475,7 +475,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/transient-outrigger.config -->
-com.sun.jini.outrigger {
+org.apache.river.outrigger {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
 }
 <!-- cut_end -->
@@ -492,7 +492,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/transient-reggie.config -->
-com.sun.jini.reggie {
+org.apache.river.reggie {
     initialMemberGroups = new String[] { "<var><b>your.group</b></var>" };
 }
 <!-- cut_end -->
@@ -529,10 +529,10 @@ Jini ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/start-persistent-jeri-services.config -->
-import com.sun.jini.start.NonActivatableServiceDescriptor;
-import com.sun.jini.start.ServiceDescriptor;
+import org.apache.river.start.NonActivatableServiceDescriptor;
+import org.apache.river.start.ServiceDescriptor;
 
-com.sun.jini.start {
+org.apache.river.start {
 
     //
     // HTTPD Service
@@ -540,7 +540,7 @@ com.sun.jini.start {
     private static httpd_codebase = "";
     private static httpd_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static httpd_classpath = "<var><b>install_dir</b></var>/lib/classserver.jar";
-    private static httpd_impl = "com.sun.jini.tool.ClassServer";
+    private static httpd_impl = "org.apache.river.tool.ClassServer";
     private static httpd_service = 
         new NonActivatableServiceDescriptor(
             httpd_codebase, httpd_policy, httpd_classpath, httpd_impl, 
@@ -554,7 +554,7 @@ com.sun.jini.start {
     private static fiddler_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static fiddler_classpath = "<var><b>install_dir</b></var>/lib/fiddler.jar";
     private static fiddler_config = "<a href="#persistent_fiddler_config"><var><b>config_dir</b></var>/persistent-fiddler.config</a>";
-    private static fiddler_impl = "com.sun.jini.fiddler.NonActivatableFiddlerImpl";
+    private static fiddler_impl = "org.apache.river.fiddler.NonActivatableFiddlerImpl";
     private static fiddler_service = 
         new NonActivatableServiceDescriptor(
             fiddler_codebase, fiddler_policy, fiddler_classpath, 
@@ -568,7 +568,7 @@ com.sun.jini.start {
     private static mahalo_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static mahalo_classpath = "<var><b>install_dir</b></var>/lib/mahalo.jar";
     private static mahalo_config = "<a href="#persistent_mahalo_config"><var><b>config_dir</b></var>/persistent-mahalo.config</a>";
-    private static mahalo_impl = "com.sun.jini.mahalo.NonActivatableMahaloImpl";
+    private static mahalo_impl = "org.apache.river.mahalo.NonActivatableMahaloImpl";
     private static mahalo_service = 
         new NonActivatableServiceDescriptor(
             mahalo_codebase, mahalo_policy, mahalo_classpath, 
@@ -582,7 +582,7 @@ com.sun.jini.start {
     private static mercury_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static mercury_classpath = "<var><b>install_dir</b></var>/lib/mercury.jar";
     private static mercury_config = "<a href="#persistent_mercury_config"><var><b>config_dir</b></var>/persistent-mercury.config</a>";
-    private static mercury_impl = "com.sun.jini.mercury.NonActivatableMercuryImpl";
+    private static mercury_impl = "org.apache.river.mercury.NonActivatableMercuryImpl";
     private static mercury_service = 
         new NonActivatableServiceDescriptor(
             mercury_codebase, mercury_policy, mercury_classpath, 
@@ -596,7 +596,7 @@ com.sun.jini.start {
     private static norm_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static norm_classpath = "<var><b>install_dir</b></var>/lib/norm.jar";
     private static norm_config = "<a href="#persistent_norm_config"><var><b>config_dir</b></var>/persistent-norm.config</a>";
-    private static norm_impl = "com.sun.jini.norm.PersistentNormServerImpl";
+    private static norm_impl = "org.apache.river.norm.PersistentNormServerImpl";
     private static norm_service = 
         new NonActivatableServiceDescriptor(
             norm_codebase, norm_policy, norm_classpath, 
@@ -610,7 +610,7 @@ com.sun.jini.start {
     private static outrigger_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static outrigger_classpath = "<var><b>install_dir</b></var>/lib/outrigger.jar";
     private static outrigger_config = "<a href="#persistent_outrigger_config"><var><b>config_dir</b></var>/persistent-outrigger.config</a>";
-    private static outrigger_impl = "com.sun.jini.outrigger.PersistentOutriggerImpl";
+    private static outrigger_impl = "org.apache.river.outrigger.PersistentOutriggerImpl";
     private static outrigger_service = 
         new NonActivatableServiceDescriptor(
             outrigger_codebase, outrigger_policy, outrigger_classpath, 
@@ -624,7 +624,7 @@ com.sun.jini.start {
     private static reggie_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static reggie_classpath = "<var><b>install_dir</b></var>/lib/reggie.jar";
     private static reggie_config = "<a href="#persistent_reggie_config"><var><b>config_dir</b></var>/persistent-reggie.config</a>";
-    private static reggie_impl = "com.sun.jini.reggie.PersistentRegistrarImpl";
+    private static reggie_impl = "org.apache.river.reggie.PersistentRegistrarImpl";
     private static reggie_service = 
         new NonActivatableServiceDescriptor(
             reggie_codebase, reggie_policy, reggie_classpath, 
@@ -659,7 +659,7 @@ import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
 
-com.sun.jini.fiddler {
+org.apache.river.fiddler {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/persistent-fiddler.log";
     serverExporter = 
@@ -689,7 +689,7 @@ import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
 
-com.sun.jini.mahalo {
+org.apache.river.mahalo {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/persistent-mahalo.log";
     serverExporter = 
@@ -719,7 +719,7 @@ import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
 
-com.sun.jini.mercury {
+org.apache.river.mercury {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/persistent-mercury.log";
     serverExporter = 
@@ -749,7 +749,7 @@ import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
 
-com.sun.jini.norm {
+org.apache.river.norm {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/persistent-norm.log";
     serverExporter = 
@@ -779,7 +779,7 @@ import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
 
-com.sun.jini.outrigger {
+org.apache.river.outrigger {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/persistent-outrigger.log";
     serverExporter = 
@@ -789,7 +789,7 @@ com.sun.jini.outrigger {
             false, 
 	    true,
 	    UuidFactory.create("<var><b>outrigger_obj_UUID_string</b></var>"));
-    store = new com.sun.jini.outrigger.snaplogstore.LogStore(this);
+    store = new org.apache.river.outrigger.snaplogstore.LogStore(this);
 }
 <!-- cut_end -->
 </pre>
@@ -810,7 +810,7 @@ import net.jini.jeri.BasicILFactory;
 import net.jini.jeri.BasicJeriExporter;
 import net.jini.jeri.tcp.TcpServerEndpoint;
 
-com.sun.jini.reggie {
+org.apache.river.reggie {
     initialMemberGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/persistent-reggie.log";
     serverExporter = 
@@ -866,12 +866,12 @@ Jini ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/start-activatable-jeri-services.config -->
-import com.sun.jini.start.NonActivatableServiceDescriptor;
-import com.sun.jini.start.ServiceDescriptor;
-import com.sun.jini.start.SharedActivatableServiceDescriptor;
-import com.sun.jini.start.SharedActivationGroupDescriptor;
+import org.apache.river.start.NonActivatableServiceDescriptor;
+import org.apache.river.start.ServiceDescriptor;
+import org.apache.river.start.SharedActivatableServiceDescriptor;
+import org.apache.river.start.SharedActivationGroupDescriptor;
 
-com.sun.jini.start {
+org.apache.river.start {
 
     //
     // HTTPD Service
@@ -879,7 +879,7 @@ com.sun.jini.start {
     private static httpd_codebase = "";
     private static httpd_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static httpd_classpath = "<var><b>install_dir</b></var>/lib/classserver.jar";
-    private static httpd_impl = "com.sun.jini.tool.ClassServer";
+    private static httpd_impl = "org.apache.river.tool.ClassServer";
     private static httpd_service = 
         new NonActivatableServiceDescriptor(
             httpd_codebase, httpd_policy, httpd_classpath,
@@ -912,7 +912,7 @@ com.sun.jini.start {
     private static fiddler_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static fiddler_classpath = "<var><b>install_dir</b></var>/lib/fiddler.jar";
     private static fiddler_config = "<a href="#activatable_fiddler_config"><var><b>config_dir</b></var>/activatable-fiddler.config</a>";
-    private static fiddler_impl = "com.sun.jini.fiddler.ActivatableFiddlerImpl";
+    private static fiddler_impl = "org.apache.river.fiddler.ActivatableFiddlerImpl";
     private static fiddler_service = 
         new SharedActivatableServiceDescriptor(
             fiddler_codebase, fiddler_policy, fiddler_classpath, 
@@ -927,7 +927,7 @@ com.sun.jini.start {
     private static mahalo_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static mahalo_classpath = "<var><b>install_dir</b></var>/lib/mahalo.jar";
     private static mahalo_config = "<a href="#activatable_mahalo_config"><var><b>config_dir</b></var>/activatable-mahalo.config</a>";
-    private static mahalo_impl = "com.sun.jini.mahalo.ActivatableMahaloImpl";
+    private static mahalo_impl = "org.apache.river.mahalo.ActivatableMahaloImpl";
     private static mahalo_service = 
         new SharedActivatableServiceDescriptor(
             mahalo_codebase, mahalo_policy, mahalo_classpath, 
@@ -942,7 +942,7 @@ com.sun.jini.start {
     private static mercury_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static mercury_classpath = "<var><b>install_dir</b></var>/lib/mercury.jar";
     private static mercury_config = "<a href="#activatable_mercury_config"><var><b>config_dir</b></var>/activatable-mercury.config</a>";
-    private static mercury_impl = "com.sun.jini.mercury.ActivatableMercuryImpl";
+    private static mercury_impl = "org.apache.river.mercury.ActivatableMercuryImpl";
     private static mercury_service = 
         new SharedActivatableServiceDescriptor(
             mercury_codebase, mercury_policy, mercury_classpath, 
@@ -957,7 +957,7 @@ com.sun.jini.start {
     private static norm_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static norm_classpath = "<var><b>install_dir</b></var>/lib/norm.jar";
     private static norm_config = "<a href="#activatable_norm_config"><var><b>config_dir</b></var>/activatable-norm.config</a>";
-    private static norm_impl = "com.sun.jini.norm.ActivatableNormServerImpl";
+    private static norm_impl = "org.apache.river.norm.ActivatableNormServerImpl";
     private static norm_service = 
         new SharedActivatableServiceDescriptor(
             norm_codebase, norm_policy, norm_classpath, 
@@ -972,7 +972,7 @@ com.sun.jini.start {
     private static outrigger_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static outrigger_classpath = "<var><b>install_dir</b></var>/lib/outrigger.jar";
     private static outrigger_config = "<a href="#activatable_outrigger_config"><var><b>config_dir</b></var>/activatable-outrigger.config</a>";
-    private static outrigger_impl = "com.sun.jini.outrigger.PersistentOutriggerImpl";
+    private static outrigger_impl = "org.apache.river.outrigger.PersistentOutriggerImpl";
     private static outrigger_service = 
         new SharedActivatableServiceDescriptor(
             outrigger_codebase, outrigger_policy, outrigger_classpath, 
@@ -987,7 +987,7 @@ com.sun.jini.start {
     private static reggie_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static reggie_classpath = "<var><b>install_dir</b></var>/lib/reggie.jar";
     private static reggie_config = "<a href="#activatable_reggie_config"><var><b>config_dir</b></var>/activatable-reggie.config</a>";
-    private static reggie_impl = "com.sun.jini.reggie.PersistentRegistrarImpl";
+    private static reggie_impl = "org.apache.river.reggie.PersistentRegistrarImpl";
     private static reggie_service = 
         new SharedActivatableServiceDescriptor(
             reggie_codebase, reggie_policy, reggie_classpath, 
@@ -1016,7 +1016,7 @@ com.sun.jini.start {
     private static shared_group_policy = "<a href="#jsk_all_policy"><var><b>config_dir</b></var>/jsk-all.policy</a>";
     private static shared_group_classpath = "<var><b>install_dir</b></var>/lib/group.jar";
     private static shared_group_config = "<a href="#activatable_group_config"><var><b>config_dir</b></var>/activatable-group.config</a>";
-    private static shared_group_impl = "com.sun.jini.start.SharedGroupImpl";
+    private static shared_group_impl = "org.apache.river.start.SharedGroupImpl";
     private static shared_group_service =
         new SharedActivatableServiceDescriptor(
 	    shared_group_codebase,
@@ -1048,7 +1048,7 @@ ERI. <p>
 <pre>
 <!-- cut_begin=config_dir/activatable-fiddler.config -->
 
-com.sun.jini.fiddler {
+org.apache.river.fiddler {
 
   initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
   persistenceDirectory = "<var><b>config_dir</b></var>/activatable-fiddler.log";
@@ -1069,7 +1069,7 @@ ERI. <p>
 <pre>
 <!-- cut_begin=config_dir/activatable-mahalo.config -->
 
-com.sun.jini.mahalo {
+org.apache.river.mahalo {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/activatable-mahalo.log";
 }
@@ -1087,7 +1087,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/activatable-mercury.config -->
-com.sun.jini.mercury {
+org.apache.river.mercury {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/activatable-mercury.log";
 }
@@ -1105,7 +1105,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/activatable-norm.config -->
-com.sun.jini.norm {
+org.apache.river.norm {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/activatable-norm.log";
 }
@@ -1123,10 +1123,10 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/activatable-outrigger.config -->
-com.sun.jini.outrigger {
+org.apache.river.outrigger {
     initialLookupGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/activatable-outrigger.log";
-    store = new com.sun.jini.outrigger.snaplogstore.LogStore(this);    
+    store = new org.apache.river.outrigger.snaplogstore.LogStore(this);    
 }
 <!-- cut_end -->
 </pre>
@@ -1142,7 +1142,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/activatable-reggie.config -->
-com.sun.jini.reggie {
+org.apache.river.reggie {
     initialMemberGroups = new String[] { "<var><b>your.group</b></var>" };
     persistenceDirectory = "<var><b>config_dir</b></var>/activatable-reggie.log";
 }
@@ -1160,7 +1160,7 @@ ERI. <p>
 <blockquote>
 <pre>
 <!-- cut_begin=config_dir/activatable-group.config -->
-com.sun.jini.start {
+org.apache.river.start {
     // Use defaults
 }
 <!-- cut_end -->
@@ -1199,7 +1199,7 @@ above, could also have used a separate, 
    
 <a name="activation"><H2>Activation System</H2></A> 
 There are two activation daemon implementations available: <code>rmid</code>
-and {@link com.sun.jini.phoenix Phoenix}. <code>rmid</code>
+and {@link org.apache.river.phoenix Phoenix}. <code>rmid</code>
 is part of the Java 2 SDK:
 <ul> 
 <li><a