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 [2/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-libs/river-lib/src/main/java/org/apache/river/constants/TxnConstants.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/TxnConstants.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/TxnConstants.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/TxnConstants.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.constants;
+package org.apache.river.constants;
import net.jini.core.transaction.server.TransactionConstants;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/VersionConstants.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/VersionConstants.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/VersionConstants.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/VersionConstants.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.constants;
+package org.apache.river.constants;
/**
* Interface that holds the version string for the current release
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/FixedLeasePeriodPolicy.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/FixedLeasePeriodPolicy.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/FixedLeasePeriodPolicy.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/FixedLeasePeriodPolicy.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.landlord;
+package org.apache.river.landlord;
import net.jini.core.lease.Lease;
import net.jini.core.lease.LeaseDeniedException;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LandlordUtil.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LandlordUtil.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LandlordUtil.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LandlordUtil.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.landlord;
+package org.apache.river.landlord;
import java.util.Map;
import java.util.ArrayList;
@@ -23,7 +23,7 @@ import java.util.ArrayList;
import net.jini.core.lease.LeaseException;
import net.jini.core.lease.UnknownLeaseException;
import net.jini.id.Uuid;
-import com.sun.jini.landlord.Landlord.RenewResults;
+import org.apache.river.landlord.Landlord.RenewResults;
/**
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeaseFactory.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeaseFactory.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeaseFactory.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeaseFactory.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.landlord;
+package org.apache.river.landlord;
import net.jini.core.constraint.RemoteMethodControl;
import net.jini.security.TrustVerifier;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasePeriodPolicy.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasePeriodPolicy.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasePeriodPolicy.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasePeriodPolicy.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.landlord;
+package org.apache.river.landlord;
import net.jini.core.lease.LeaseDeniedException;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasedResource.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasedResource.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasedResource.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasedResource.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.landlord;
+package org.apache.river.landlord;
import net.jini.id.Uuid;
import net.jini.id.ReferentUuid;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LocalLandlord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LocalLandlord.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LocalLandlord.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LocalLandlord.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.landlord;
+package org.apache.river.landlord;
import net.jini.core.lease.LeaseDeniedException;
import net.jini.core.lease.UnknownLeaseException;
@@ -38,7 +38,7 @@ import net.jini.id.Uuid;
*
* @author Sun Microsystems, Inc.
*
- * @see com.sun.jini.landlord.Landlord
+ * @see org.apache.river.landlord.Landlord
* @since 2.0
*/
public interface LocalLandlord {
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/lookup/entry/LookupAttributes.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/lookup/entry/LookupAttributes.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/lookup/entry/LookupAttributes.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/lookup/entry/LookupAttributes.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.sun.jini.lookup.entry;
+package org.apache.river.lookup.entry;
import net.jini.core.entry.Entry;
import net.jini.lookup.entry.ServiceControlled;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/phoenix/ActivationAdmin.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/phoenix/ActivationAdmin.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/phoenix/ActivationAdmin.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/phoenix/ActivationAdmin.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.phoenix;
+package org.apache.river.phoenix;
import java.rmi.Remote;
import java.rmi.RemoteException;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogException.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogException.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogException.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogException.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.sun.jini.reliableLog;
+package org.apache.river.reliableLog;
import java.io.IOException;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogHandler.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogHandler.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogHandler.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogHandler.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.sun.jini.reliableLog;
+package org.apache.river.reliableLog;
import java.io.InputStream;
import java.io.ObjectInputStream;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogInputStream.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogInputStream.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogInputStream.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogInputStream.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.sun.jini.reliableLog;
+package org.apache.river.reliableLog;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogOutputStream.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogOutputStream.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogOutputStream.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.sun.jini.reliableLog;
+package org.apache.river.reliableLog;
import java.io.IOException;
import java.io.OutputStream;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/ReliableLog.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/ReliableLog.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/ReliableLog.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/ReliableLog.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package com.sun.jini.reliableLog;
+package org.apache.river.reliableLog;
import java.io.BufferedInputStream;
import java.io.DataInputStream;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/start/LifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/start/LifeCycle.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/start/LifeCycle.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/start/LifeCycle.java Sat Jan 15 12:03:35 2011
@@ -16,20 +16,20 @@
* limitations under the License.
*/
-package com.sun.jini.start;
+package org.apache.river.start;
/**
* The interface used to manage the lifecycle of shared, non-activatable
* services started by the
- * {@linkplain com.sun.jini.start service starter}. Services
+ * {@linkplain org.apache.river.start service starter}. Services
* started via a
- * {@link com.sun.jini.start.NonActivatableServiceDescriptor} get passed a
+ * {@link org.apache.river.start.NonActivatableServiceDescriptor} get passed a
* reference to a <code>LifeCycle</code> object, which can be used by the
* server to inform the hosting environment that it can release any resources
* associated with the server (presumably because the server is terminating).
*
- * @see com.sun.jini.start.NonActivatableServiceDescriptor
- * @see com.sun.jini.start.ServiceStarter
+ * @see org.apache.river.start.NonActivatableServiceDescriptor
+ * @see org.apache.river.start.ServiceStarter
*
* @author Sun Microsystems, Inc.
*
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InProgress.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InProgress.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InProgress.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InProgress.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.thread;
+package org.apache.river.thread;
/**
* This class provides a blocking mechanism that will not proceed while
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InterruptedStatusThread.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InterruptedStatusThread.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InterruptedStatusThread.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InterruptedStatusThread.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.thread;
+package org.apache.river.thread;
/**
* Common Thread subclass to handle potential loss of
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadersWriter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadersWriter.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadersWriter.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadersWriter.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.thread;
+package org.apache.river.thread;
/**
* An Object to control the concurrent state. Allows multiple readers or
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadyState.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadyState.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadyState.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadyState.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.thread;
+package org.apache.river.thread;
import java.rmi.NoSuchObjectException;
import java.rmi.RemoteException;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/RetryTask.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/RetryTask.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/RetryTask.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/RetryTask.java Sat Jan 15 12:03:35 2011
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.sun.jini.thread;
+package org.apache.river.thread;
import java.util.logging.Level;
import java.util.logging.Logger;
-import com.sun.jini.constants.TimeConstants;
+import org.apache.river.constants.TimeConstants;
/**
* An abstract class for building tasks that retry on failure after a
@@ -42,7 +42,7 @@ import com.sun.jini.constants.TimeConsta
* behavior.<p>
*
* This class uses the {@link Logger} named
- * <code>com.sun.jini.thread.RetryTask</code> to log information at
+ * <code>org.apache.river.thread.RetryTask</code> to log information at
* the following logging levels: <p>
*
* <table border=1 cellpadding=5
@@ -61,7 +61,7 @@ import com.sun.jini.constants.TimeConsta
* @see TaskManager
* @see WakeupManager
*/
-import com.sun.jini.thread.WakeupManager.Ticket;
+import org.apache.river.thread.WakeupManager.Ticket;
public abstract class RetryTask implements TaskManager.Task, TimeConstants {
private TaskManager manager; // the TaskManager for this task
@@ -92,7 +92,7 @@ public abstract class RetryTask implemen
/** Logger for this class */
private static final Logger logger =
- Logger.getLogger("com.sun.jini.thread.RetryTask");
+ Logger.getLogger("org.apache.river.thread.RetryTask");
/**
* Create a new <code>RetryTask</code> that will be scheduled with
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/StreamPlugThread.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/StreamPlugThread.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/StreamPlugThread.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/StreamPlugThread.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.thread;
+package org.apache.river.thread;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/TaskManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/TaskManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/TaskManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/TaskManager.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.thread;
+package org.apache.river.thread;
import java.util.ArrayList;
import java.util.Collection;
@@ -35,14 +35,14 @@ import java.util.logging.Logger;
* the queue (including tasks that are currently being worked on).
* <p>
* This class uses the {@link Logger} named
- * <code>com.sun.jini.thread.TaskManager</code> to log information at
+ * <code>org.apache.river.thread.TaskManager</code> to log information at
* the following logging levels:
* <p>
* <table border=1 cellpadding=5
* summary="Describes logging performed by TaskManager at different
* logging levels">
* <caption halign="center" valign="top"><b><code>
- * com.sun.jini.thread.TaskManager</code></b></caption>
+ * org.apache.river.thread.TaskManager</code></b></caption>
* <tr><th>Level<th>Description
* <tr><td>{@link Level#SEVERE SEVERE}<td>
* failure to create a worker thread when no other worker threads exist
@@ -73,7 +73,7 @@ public class TaskManager {
/** Logger */
protected static final Logger logger =
- Logger.getLogger("com.sun.jini.thread.TaskManager");
+ Logger.getLogger("org.apache.river.thread.TaskManager");
/** Active and pending tasks */
protected final ArrayList tasks = new ArrayList();
Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/WakeupManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/WakeupManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/WakeupManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/WakeupManager.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.thread;
+package org.apache.river.thread;
-import com.sun.jini.config.Config;
+import org.apache.river.config.Config;
import java.text.DateFormat;
import java.util.SortedSet;
@@ -68,7 +68,7 @@ import net.jini.config.ConfigurationExce
* <a name="ConfigEntries">
* <code>WakeupManager</code> supports the <code>queueThreadTimeout</code>
* configuration entry, with the component
- * <code>com.sun.jini.thread.WakeupManager</code>.
+ * <code>org.apache.river.thread.WakeupManager</code>.
*
* <a name="queueThreadTimeout">
* <table summary="Describes the queueThreadTimeout configuration entry"
@@ -95,7 +95,7 @@ import net.jini.config.ConfigurationExce
* <p>
*
* This class uses the {@link Logger} named
- * <code>com.sun.jini.thread.WakeupManager</code> to log information at
+ * <code>org.apache.river.thread.WakeupManager</code> to log information at
* the following logging levels: <p>
*
* <table border=1 cellpadding=5
@@ -122,7 +122,7 @@ import net.jini.config.ConfigurationExce
public class WakeupManager {
/** Component we pull configuration entries from and our logger name */
private final static String COMPONENT_NAME =
- "com.sun.jini.thread.WakeupManager";
+ "org.apache.river.thread.WakeupManager";
/** Default value for <code>queueThreadTimeout</code> */
private final static long DEFAULT_QUEUE_THREAD_TIMEOUT = 30000;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivatableInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivatableInvocationHandler.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivatableInvocationHandler.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivatableInvocationHandler.java Sat Jan 15 12:03:35 2011
@@ -18,9 +18,9 @@
package net.jini.activation;
-import com.sun.jini.action.GetBooleanAction;
-import com.sun.jini.jeri.internal.runtime.Util;
-import com.sun.jini.logging.Levels;
+import org.apache.river.action.GetBooleanAction;
+import org.apache.river.jeri.internal.runtime.Util;
+import org.apache.river.logging.Levels;
import java.io.IOException;
import java.io.InvalidObjectException;
import java.io.ObjectInputStream;
@@ -69,11 +69,11 @@ import net.jini.security.proxytrust.Trus
* @author Sun Microsystems, Inc.
* @since 2.0
*
- * @com.sun.jini.impl
+ * @org.apache.river.impl
*
* This implementation recognizes the following system property:
* <ul>
- * <li><code>com.sun.jini.activation.enableActivateGrant</code> - This
+ * <li><code>org.apache.river.activation.enableActivateGrant</code> - This
* property is interpreted as a <code>boolean</code> value (see {@link
* Boolean#getBoolean Boolean.getBoolean}). If <code>true</code>, this
* implementation invokes {@link Security#grant(Class,Class) Security.grant}
@@ -147,7 +147,7 @@ public final class ActivatableInvocation
*/
private static final boolean enableGrant =
((Boolean) AccessController.doPrivileged(new GetBooleanAction(
- "com.sun.jini.activation.enableActivateGrant")))
+ "org.apache.river.activation.enableActivateGrant")))
.booleanValue();
/**
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivationGroup.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivationGroup.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivationGroup.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivationGroup.java Sat Jan 15 12:03:35 2011
@@ -39,7 +39,7 @@ import net.jini.security.Security;
* #createGroup createGroup} method of this class to be called. The
* standard <code>rmid</code> does not do this.
*
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
*
* Unlike <code>rmid</code>, <a
* href="../../../com/sun/jini/phoenix/package-summary.html#package_description">phoenix</a>
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/AbstractConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/AbstractConfiguration.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/AbstractConfiguration.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/AbstractConfiguration.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
package net.jini.config;
-import com.sun.jini.logging.Levels;
+import org.apache.river.logging.Levels;
import java.util.Arrays;
import java.util.logging.Level;
import java.util.logging.LogRecord;
@@ -40,7 +40,7 @@ import java.util.logging.Logger;
* @author Sun Microsystems, Inc.
* @since 2.0
*
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
*
* This implementation uses the {@link Logger} named
* <code>net.jini.config</code> to log information at the following logging
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationFile.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationFile.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationFile.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationFile.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
package net.jini.config;
-import com.sun.jini.logging.Levels;
+import org.apache.river.logging.Levels;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -354,7 +354,7 @@ import net.jini.security.Security;
* @author Sun Microsystems, Inc.
* @since 2.0
*
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
*
* This implementation uses the {@link Logger} named
* <code>net.jini.config</code> to log information at the following logging
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationProvider.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationProvider.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationProvider.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationProvider.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
package net.jini.config;
-import com.sun.jini.logging.Levels;
+import org.apache.river.logging.Levels;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -71,7 +71,7 @@ import net.jini.security.Security;
* @author Sun Microsystems, Inc.
* @since 2.0
*
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
*
* This implementation uses the {@link Logger} named
* <code>net.jini.config</code> to log information at the following logging
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/EmptyConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/EmptyConfiguration.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/EmptyConfiguration.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/EmptyConfiguration.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
package net.jini.config;
-import com.sun.jini.logging.Levels;
+import org.apache.river.logging.Levels;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -31,7 +31,7 @@ import java.util.logging.Logger;
* @author Sun Microsystems, Inc.
* @since 2.0
*
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
*
* This implementation uses the {@link Logger} named
* <code>net.jini.config</code> to log information at the following logging
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/package.html Sat Jan 15 12:03:35 2011
@@ -137,7 +137,7 @@ argument that specifies the location of
@since 2.0
@version 2.0
-@com.sun.jini.impl <!-- Implementation Specifics -->
+@org.apache.river.impl <!-- Implementation Specifics -->
<p><a name="Logging">
<font size="+1"><b>Loggers and Logging Levels</b></font>
@@ -160,7 +160,7 @@ information at the following logging lev
<tr> <td> {@link java.util.logging.Level#INFO INFO} <td> problems adding new
prohibited methods for <code>ConfigurationFile</code>
-<tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED} <td> problems
+<tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED} <td> problems
getting a configuration using <code>ConfigurationProvider</code>,
or problems getting entries, including getting entries that are not
found, from the configuration implementation classes
@@ -175,7 +175,7 @@ information at the following logging lev
</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/net/jini/core/discovery/LookupLocator.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java Sat Jan 15 12:03:35 2011
@@ -17,7 +17,7 @@
*/
package net.jini.core.discovery;
-import com.sun.jini.jeri.internal.runtime.Util;
+import org.apache.river.jeri.internal.runtime.Util;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java Sat Jan 15 12:03:35 2011
@@ -18,11 +18,11 @@
package net.jini.discovery;
-import com.sun.jini.discovery.Discovery;
-import com.sun.jini.discovery.DiscoveryConstraints;
-import com.sun.jini.discovery.UnicastResponse;
-import com.sun.jini.discovery.UnicastSocketTimeout;
-import com.sun.jini.discovery.internal.MultiIPDiscovery;
+import org.apache.river.discovery.Discovery;
+import org.apache.river.discovery.DiscoveryConstraints;
+import org.apache.river.discovery.UnicastResponse;
+import org.apache.river.discovery.UnicastSocketTimeout;
+import org.apache.river.discovery.internal.MultiIPDiscovery;
import java.io.IOException;
import java.lang.reflect.Method;
import java.net.MalformedURLException;
@@ -51,15 +51,15 @@ import net.jini.core.lookup.ServiceRegis
* @author Sun Microsystems, Inc.
* @since 2.0
*
- * @com.sun.jini.impl
+ * @org.apache.river.impl
*
* This class supports use of the following constraint types to control unicast
* discovery behavior:
* <ul>
- * <li> {@link com.sun.jini.discovery.DiscoveryProtocolVersion}: this
+ * <li> {@link org.apache.river.discovery.DiscoveryProtocolVersion}: this
* constraint can be used to control which version of the unicast
* discovery protocol is used.
- * <li> {@link com.sun.jini.discovery.UnicastSocketTimeout}: this constraint
+ * <li> {@link org.apache.river.discovery.UnicastSocketTimeout}: this constraint
* can be used to control the read timeout set on sockets over which
* unicast discovery is performed.
* <li> {@link net.jini.core.constraint.ConnectionRelativeTime}:
@@ -70,8 +70,8 @@ import net.jini.core.lookup.ServiceRegis
* set on sockets over which unicast discovery is performed.
* </ul>
* <p>
- * In addition, the {@link com.sun.jini.discovery.MulticastMaxPacketSize} and
- * {@link com.sun.jini.discovery.MulticastTimeToLive} constraint types are
+ * In addition, the {@link org.apache.river.discovery.MulticastMaxPacketSize} and
+ * {@link org.apache.river.discovery.MulticastTimeToLive} constraint types are
* trivially supported, but do not have any effect on unicast discovery
* operations. Constraints other than those mentioned above are passed on to
* the underlying implementations of versions 1 and 2 of the discovery
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/export/ServerContext.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/export/ServerContext.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/export/ServerContext.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/export/ServerContext.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
package net.jini.export;
-import com.sun.jini.resource.Service;
+import org.apache.river.resource.Service;
import java.rmi.server.ServerNotActiveException;
import java.security.PrivilegedAction;
import java.util.ArrayList;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/iiop/IiopExporter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/iiop/IiopExporter.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/iiop/IiopExporter.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/iiop/IiopExporter.java Sat Jan 15 12:03:35 2011
@@ -48,7 +48,7 @@ import org.omg.CORBA.ORB;
* @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.iiop.IiopExporter</code> to log
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/AbstractILFactory.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/AbstractILFactory.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/AbstractILFactory.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/AbstractILFactory.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
package net.jini.jeri;
-import com.sun.jini.jeri.internal.runtime.Util;
+import org.apache.river.jeri.internal.runtime.Util;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationDispatcher.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationDispatcher.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationDispatcher.java Sat Jan 15 12:03:35 2011
@@ -18,10 +18,10 @@
package net.jini.jeri;
-import com.sun.jini.action.GetBooleanAction;
-import com.sun.jini.jeri.internal.runtime.Util;
-import com.sun.jini.jeri.internal.runtime.WeakKey;
-import com.sun.jini.logging.Levels;
+import org.apache.river.action.GetBooleanAction;
+import org.apache.river.jeri.internal.runtime.Util;
+import org.apache.river.jeri.internal.runtime.WeakKey;
+import org.apache.river.logging.Levels;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
@@ -116,11 +116,11 @@ import net.jini.security.proxytrust.Serv
* @see BasicInvocationHandler
* @since 2.0
*
- * @com.sun.jini.impl
+ * @org.apache.river.impl
*
* This implementation uses the following system property:
* <dl>
- * <dt><code>com.sun.jini.jeri.server.suppressStackTrace</code>
+ * <dt><code>org.apache.river.jeri.server.suppressStackTrace</code>
* <dd>If <code>true</code>, removes server-side stack traces before
* marshalling an exception thrown as a result of a remote call. The
* default value is <code>false</code>.
@@ -201,7 +201,7 @@ public class BasicInvocationDispatcher i
*/
private static final boolean suppressStackTraces =
((Boolean) AccessController.doPrivileged(new GetBooleanAction(
- "com.sun.jini.jeri.server.suppressStackTraces")))
+ "org.apache.river.jeri.server.suppressStackTraces")))
.booleanValue();
/** Empty codesource. */
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationHandler.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationHandler.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationHandler.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationHandler.java Sat Jan 15 12:03:35 2011
@@ -18,8 +18,8 @@
package net.jini.jeri;
-import com.sun.jini.jeri.internal.runtime.Util;
-import com.sun.jini.logging.Levels;
+import org.apache.river.jeri.internal.runtime.Util;
+import org.apache.river.logging.Levels;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
@@ -84,7 +84,7 @@ import net.jini.security.proxytrust.Trus
* @see BasicInvocationDispatcher
* @since 2.0
*
- * @com.sun.jini.impl
+ * @org.apache.river.impl
*
* This implementation's {@link #invoke invoke} method throws {@link
* IllegalArgumentException} if a remote invocation is to be made and
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicJeriExporter.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicJeriExporter.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicJeriExporter.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicJeriExporter.java Sat Jan 15 12:03:35 2011
@@ -18,8 +18,8 @@
package net.jini.jeri;
-import com.sun.jini.jeri.internal.runtime.BasicExportTable;
-import com.sun.jini.logging.Levels;
+import org.apache.river.jeri.internal.runtime.BasicExportTable;
+import org.apache.river.logging.Levels;
import java.lang.ref.WeakReference;
import java.rmi.Remote;
import java.rmi.RemoteException;
@@ -305,7 +305,7 @@ import net.jini.security.SecurityContext
* @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.jeri.BasicJeriExporter</code> to log
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicObjectEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicObjectEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicObjectEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicObjectEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,9 +18,9 @@
package net.jini.jeri;
-import com.sun.jini.jeri.internal.runtime.DgcClient;
-import com.sun.jini.jeri.internal.runtime.Util;
-import com.sun.jini.logging.Levels;
+import org.apache.river.jeri.internal.runtime.DgcClient;
+import org.apache.river.jeri.internal.runtime.Util;
+import org.apache.river.logging.Levels;
import java.io.EOFException;
import java.io.IOException;
import java.io.InvalidObjectException;
@@ -177,7 +177,7 @@ import net.jini.security.proxytrust.Trus
* @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.jeri.BasicObjectEndpoint</code> to log information
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ConnectionManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ConnectionManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ConnectionManager.java Sat Jan 15 12:03:35 2011
@@ -18,11 +18,11 @@
package net.jini.jeri.connection;
-import com.sun.jini.action.GetLongAction;
-import com.sun.jini.jeri.internal.mux.MuxClient;
-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.mux.MuxClient;
+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;
@@ -62,7 +62,7 @@ import net.jini.jeri.OutboundRequestIter
* @author Sun Microsystems, Inc.
* @since 2.0
*
- * @com.sun.jini.impl
+ * @org.apache.river.impl
*
* This implementation uses the {@link Logger} named
* <code>net.jini.jeri.connection.ConnectionManager</code> to log
@@ -102,7 +102,7 @@ import net.jini.jeri.OutboundRequestIter
*
* <p><ul>
*
- * <li><code>com.sun.jini.jeri.connectionTimeout</code> - Time in
+ * <li><code>org.apache.river.jeri.connectionTimeout</code> - Time in
* milliseconds to leave idle client-side connections around before
* closing them. The default value is 15000 milliseconds (15 seconds).
*
@@ -114,7 +114,7 @@ public final class ConnectionManager {
*/
private static final long TIMEOUT =
((Long) AccessController.doPrivileged(new GetLongAction(
- "com.sun.jini.jeri.connectionTimeout",
+ "org.apache.river.jeri.connectionTimeout",
15000))).longValue();
/**
* ConnectionManager logger.
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ServerConnectionManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ServerConnectionManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ServerConnectionManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ServerConnectionManager.java Sat Jan 15 12:03:35 2011
@@ -18,8 +18,8 @@
package net.jini.jeri.connection;
-import com.sun.jini.jeri.internal.mux.MuxServer;
-import com.sun.jini.logging.Levels;
+import org.apache.river.jeri.internal.mux.MuxServer;
+import org.apache.river.logging.Levels;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -52,7 +52,7 @@ import net.jini.jeri.RequestDispatcher;
* @author Sun Microsystems, Inc.
* @since 2.0
*
- * @com.sun.jini.impl
+ * @org.apache.river.impl
*
* This implementation uses the {@link Logger} named
* <code>net.jini.jeri.connection.ServerConnectionManager</code> to
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,14 +18,14 @@
package net.jini.jeri.http;
-import com.sun.jini.jeri.internal.http.ConnectionTimer;
-import com.sun.jini.jeri.internal.http.HttpClientConnection;
-import com.sun.jini.jeri.internal.http.HttpClientManager;
-import com.sun.jini.jeri.internal.http.HttpClientSocketFactory;
-import com.sun.jini.jeri.internal.http.HttpSettings;
-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.http.ConnectionTimer;
+import org.apache.river.jeri.internal.http.HttpClientConnection;
+import org.apache.river.jeri.internal.http.HttpClientManager;
+import org.apache.river.jeri.internal.http.HttpClientSocketFactory;
+import org.apache.river.jeri.internal.http.HttpSettings;
+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;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpServerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpServerEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpServerEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpServerEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,15 +18,15 @@
package net.jini.jeri.http;
-import com.sun.jini.jeri.internal.http.ConnectionTimer;
-import com.sun.jini.jeri.internal.http.HttpServerConnection;
-import com.sun.jini.jeri.internal.http.HttpServerManager;
-import com.sun.jini.jeri.internal.http.HttpSettings;
-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.jeri.internal.http.ConnectionTimer;
+import org.apache.river.jeri.internal.http.HttpServerConnection;
+import org.apache.river.jeri.internal.http.HttpServerManager;
+import org.apache.river.jeri.internal.http.HttpSettings;
+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.net.InetAddress;
import java.net.ServerSocket;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/package.html Sat Jan 15 12:03:35 2011
@@ -135,7 +135,7 @@ are not supported.)
@since 2.0
@version 2.0
-@com.sun.jini.impl
+@org.apache.river.impl
<h2>Logging</h2>
@@ -148,10 +148,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
@@ -173,7 +173,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}
@@ -188,23 +188,23 @@ implementation of <code>HttpEndpoint</co
recognizes the following system properties:
<p>
<ul>
-<li><code>com.sun.jini.jeri.http.idleConnectionTimeout</code> - The number of
+<li><code>org.apache.river.jeri.http.idleConnectionTimeout</code> - The number of
milliseconds to retain idle client-side HTTP connections before closing
them. The default is <code>15000</code>.
-<li><code>com.sun.jini.jeri.http.idleServerConnectionTimeout</code> - The
+<li><code>org.apache.river.jeri.http.idleServerConnectionTimeout</code> - The
number of milliseconds to retain idle server-side HTTP connections before
closing them. The default is the idle client-side connection timeout (as
- specified by the <code>com.sun.jini.jeri.http.idleConnectionTimeout</code>
+ specified by the <code>org.apache.river.jeri.http.idleConnectionTimeout</code>
system property) plus <code>10000</code>.
-<li><code>com.sun.jini.jeri.http.responseAckTimeout</code> - The number of
+<li><code>org.apache.river.jeri.http.responseAckTimeout</code> - The number of
milliseconds to wait for acknowledgments from
{@link net.jini.io.context.AcknowledgmentSource} instances. The default is
<code>15000</code>.
-<li><code>com.sun.jini.jeri.http.disableProxyPersistentConnections</code> - If
+<li><code>org.apache.river.jeri.http.disableProxyPersistentConnections</code> - If
the value is case-insensitive equal to <code>true</code>, client-side
connections through the HTTP proxy are not reused across requests;
otherwise, persistent connections are maintained and reused if possible.
-<li><code>com.sun.jini.jeri.http.pingProxyConnections</code> - If
+<li><code>org.apache.river.jeri.http.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
@@ -217,7 +217,7 @@ recognizes the following system properti
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.http.pingProxyConnectionTimeout</code> - The
+<li><code>org.apache.river.jeri.http.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/kerberos/KerberosEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java Sat Jan 15 12:03:35 2011
@@ -17,16 +17,16 @@
*/
package net.jini.jeri.kerberos;
-import com.sun.jini.action.GetIntegerAction;
-import com.sun.jini.discovery.internal.EndpointInternals;
-import com.sun.jini.discovery.internal.KerberosEndpointInternalsAccess;
-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.connection.ServerConnManager;
-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.GetIntegerAction;
+import org.apache.river.discovery.internal.EndpointInternals;
+import org.apache.river.discovery.internal.KerberosEndpointInternalsAccess;
+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.connection.ServerConnManager;
+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;
@@ -189,7 +189,7 @@ import org.ietf.jgss.GSSName;
* (DGC); if DGC is enabled using {@link net.jini.jeri.BasicJeriExporter},
* all DGC remote calls through this provider will silently fail.
*
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
*
* This Kerberos provider implementation uses the <a
* href="http://www.ietf.org/rfc/rfc2853.txt"> Java(TM) GSS-API</a> to
@@ -220,12 +220,12 @@ import org.ietf.jgss.GSSName;
*
* <tr> <td> {@link java.util.logging.Level#WARNING WARNING}
* <td> failure to register with discovery provider
- * <tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED}
+ * <tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED}
* <td> problem to support constraint requirements, connect to
* server through socket, establish {@link
* org.ietf.jgss.GSSContext} to server over established
* connections, or wrap/unwrap GSS tokens
- * <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 set TCP no delay or keep
* alive properties on sockets, connect a socket, or reuse
* a connection
@@ -245,12 +245,12 @@ import org.ietf.jgss.GSSName;
* <p>
*
* <ul>
- * <li>com.sun.jini.jeri.kerberos.KerberosEndpoint.minGssContextLifetime -
+ * <li>org.apache.river.jeri.kerberos.KerberosEndpoint.minGssContextLifetime -
* Minimum number of seconds of remaining lifetime a {@link
* GSSContext} of an existing connection has to have before it can
* be considered as a candidate connection to be chosen for a new
* request. The default is 30.
- * <li>com.sun.jini.jeri.kerberos.KerberosEndpoint.maxGssContextRetries -
+ * <li>org.apache.river.jeri.kerberos.KerberosEndpoint.maxGssContextRetries -
* <a href="http://www.ietf.org/rfc/rfc1510.txt">RFC 1510</a>
* specifies that if a KDC or server receives two authenticators
* with the same client and server pair and timestamps of the
@@ -324,7 +324,7 @@ public final class KerberosEndpoint
private static final int maxCacheSize =
((Integer) AccessController.doPrivileged(
new GetIntegerAction(
- "com.sun.jini.jeri.kerberos.KerberosEndpoint.maxCacheSize",
+ "org.apache.river.jeri.kerberos.KerberosEndpoint.maxCacheSize",
64))).intValue();
/**
@@ -336,14 +336,14 @@ public final class KerberosEndpoint
private static final int minGssContextLifetime =
((Integer) AccessController.doPrivileged(
new GetIntegerAction(
- "com.sun.jini.jeri.kerberos.KerberosEndpoint." +
+ "org.apache.river.jeri.kerberos.KerberosEndpoint." +
"minGssContextLifetime", 30))).intValue();
/** Maximum retries for initial {@link GSSContext} handshake. */
private static final int maxGssContextRetries =
((Integer) AccessController.doPrivileged(
new GetIntegerAction(
- "com.sun.jini.jeri.kerberos.KerberosEndpoint." +
+ "org.apache.river.jeri.kerberos.KerberosEndpoint." +
"maxGssContextRetries", 3))).intValue();
/**
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosServerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosServerEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosServerEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosServerEndpoint.java Sat Jan 15 12:03:35 2011
@@ -17,13 +17,13 @@
*/
package net.jini.jeri.kerberos;
-import com.sun.jini.action.GetIntegerAction;
-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.thread.Executor;
-import com.sun.jini.thread.GetThreadPoolAction;
-import com.sun.jini.logging.Levels;
+import org.apache.river.action.GetIntegerAction;
+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.thread.Executor;
+import org.apache.river.thread.GetThreadPoolAction;
+import org.apache.river.logging.Levels;
import com.sun.security.jgss.GSSUtil;
import net.jini.core.constraint.ClientAuthentication;
import net.jini.core.constraint.ClientMaxPrincipal;
@@ -195,7 +195,7 @@ import org.ietf.jgss.GSSName;
* (DGC); if DGC is enabled using {@link net.jini.jeri.BasicJeriExporter},
* all DGC remote calls through this provider will silently fail.
*
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
*
* This class uses the following {@link Logger} to log information
* at the following logging levels: <p>
@@ -211,7 +211,7 @@ import org.ietf.jgss.GSSName;
* <tr> <td> {@link java.util.logging.Level#WARNING WARNING}
* <td> unexpected failure while accepting connections on the created
* <code>ServerSocket</code>.
- * <tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED}
+ * <tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED}
*
* <td> problems with permission checking, server principal and
* Kerberos key presence checking, {@link
@@ -219,7 +219,7 @@ import org.ietf.jgss.GSSName;
* acception, {@link org.ietf.jgss.GSSContext}
* establishment, credential expiration, or wrap/unwrap
* GSS tokens
- * <tr> <td> {@link com.sun.jini.logging.Levels#HANDLED HANDLED}
+ * <tr> <td> {@link org.apache.river.logging.Levels#HANDLED HANDLED}
* <td> failure to set TCP no delay or keep alive properties on
* sockets
* <tr> <td> {@link java.util.logging.Level#FINE FINE}
@@ -281,7 +281,7 @@ public final class KerberosServerEndpoin
/** Maximum size of the soft cache */
private static final int maxCacheSize = ((Integer) Security.doPrivileged(
- new GetIntegerAction("com.sun.jini.jeri.kerberos." +
+ new GetIntegerAction("org.apache.river.jeri.kerberos." +
"KerberosServerEndpoint.maxCacheSize",
256))).intValue();
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosUtil.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosUtil.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosUtil.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosUtil.java Sat Jan 15 12:03:35 2011
@@ -17,7 +17,7 @@
*/
package net.jini.jeri.kerberos;
-import com.sun.jini.logging.Levels;
+import org.apache.river.logging.Levels;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.InputStream;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/package.html Sat Jan 15 12:03:35 2011
@@ -83,7 +83,7 @@ standard constraints: <p>
element is supported
</ul> <p>
-@com.sun.jini.impl <!-- Implementation Specifics -->
+@org.apache.river.impl <!-- Implementation Specifics -->
Classes in this package use the <a
href="http://www.ietf.org/rfc/rfc2853.txt">Java(TM) GSS-API</a> to
@@ -149,12 +149,12 @@ following levels: <p>
<tr> <td> {@link java.util.logging.Level#WARNING WARNING}
<td> failure to register with discovery provider
- <tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED}
+ <tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED}
<td> problem to support constraint requirements, connect to
server through socket, establish {@link
org.ietf.jgss.GSSContext} to server over established
connections, or wrap/unwrap GSS tokens
- <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 set TCP no delay or keep
alive properties on sockets, connect a socket, or reuse
a connection
@@ -182,14 +182,14 @@ following levels: <p>
<td> unexpected failure while accepting connections on the created
<code>ServerSocket</code>.
- <tr> <td> {@link com.sun.jini.logging.Levels#FAILED FAILED}
+ <tr> <td> {@link org.apache.river.logging.Levels#FAILED FAILED}
<td> problems with permission checking, server principal and
Kerberos key presence checking, {@link
org.ietf.jgss.GSSCredential} creation, socket connect
exception, <code>GSSContext</code> establishment,
credential expiration, or wrap/unwrap GSS tokens
- <tr> <td> {@link com.sun.jini.logging.Levels#HANDLED HANDLED}
+ <tr> <td> {@link org.apache.river.logging.Levels#HANDLED HANDLED}
<td> failure to set TCP no delay or keep alive properties on
sockets
<tr> <td> {@link java.util.logging.Level#FINE FINE}
@@ -230,12 +230,12 @@ The client endpoints of this provider re
property: <p>
<ul>
-<li>com.sun.jini.jeri.kerberos.KerberosEndpoint.minGssContextLifetime -
+<li>org.apache.river.jeri.kerberos.KerberosEndpoint.minGssContextLifetime -
Minimum number of seconds of remaining lifetime a {@link
org.ietf.jgss.GSSContext} of an existing connection has to have
before it can be considered as a candidate connection to be chosen
for a new request. The default is 30.
-<li>com.sun.jini.jeri.kerberos.KerberosEndpoint.maxGssContextRetries -
+<li>org.apache.river.jeri.kerberos.KerberosEndpoint.maxGssContextRetries -
RFC 1510 specifies that if a KDC or server receives two
authenticators with the same client and server pair and timestamps
of the same microsecond, the second will be considered a replay
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/AuthManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/AuthManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/AuthManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/AuthManager.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.lang.ref.WeakReference;
import java.security.GeneralSecurityException;
import java.security.KeyException;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/FilterX509TrustManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/FilterX509TrustManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/FilterX509TrustManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/FilterX509TrustManager.java Sat Jan 15 12:03:35 2011
@@ -18,7 +18,7 @@
package net.jini.jeri.ssl;
-import com.sun.jini.action.GetPropertyAction;
+import org.apache.river.action.GetPropertyAction;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
@@ -52,7 +52,7 @@ class FilterX509TrustManager extends Uti
private static final String trustManagerFactoryAlgorithm =
(String) Security.doPrivileged(
new GetPropertyAction(
- "com.sun.jini.jeri.ssl.trustManagerFactoryAlgorithm",
+ "org.apache.river.jeri.ssl.trustManagerFactoryAlgorithm",
TrustManagerFactory.getDefaultAlgorithm()));
/** The set of permitted remote principals, or null if no restriction. */
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,13 +18,13 @@
package net.jini.jeri.ssl;
-import com.sun.jini.jeri.internal.http.HttpClientConnection;
-import com.sun.jini.jeri.internal.http.HttpClientManager;
-import com.sun.jini.jeri.internal.http.HttpClientSocketFactory;
-import com.sun.jini.jeri.internal.http.HttpSettings;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.thread.Executor;
-import com.sun.jini.thread.GetThreadPoolAction;
+import org.apache.river.jeri.internal.http.HttpClientConnection;
+import org.apache.river.jeri.internal.http.HttpClientManager;
+import org.apache.river.jeri.internal.http.HttpClientSocketFactory;
+import org.apache.river.jeri.internal.http.HttpSettings;
+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.InvalidObjectException;
@@ -200,7 +200,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"
@@ -258,7 +258,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>
@@ -266,7 +266,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}.
@@ -289,20 +289,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
@@ -310,14 +310,14 @@ import net.jini.security.proxytrust.Trus
* the JSSE implementation. Suites appearing earlier in the list will be
* preferred to ones appearing later for suites that support the same
* requirements and preferences.
- * <li> <code>com.sun.jini.jeri.https.idleConnectionTimeout</code> - The number
+ * <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.responseAckTimeout</code> - The number of
+ * <li> <code>org.apache.river.jeri.https.responseAckTimeout</code> - The number of
* milliseconds to keep track of acknowledgments that have not yet been
* sent for {@link AcknowledgmentSource} instances. 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
@@ -330,7 +330,7 @@ import net.jini.security.proxytrust.Trus
* 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/ssl/HttpsServerEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsServerEndpoint.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsServerEndpoint.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsServerEndpoint.java Sat Jan 15 12:03:35 2011
@@ -18,11 +18,11 @@
package net.jini.jeri.ssl;
-import com.sun.jini.jeri.internal.http.ConnectionTimer;
-import com.sun.jini.jeri.internal.http.HttpServerConnection;
-import com.sun.jini.jeri.internal.http.HttpServerManager;
-import com.sun.jini.jeri.internal.http.HttpSettings;
-import com.sun.jini.logging.Levels;
+import org.apache.river.jeri.internal.http.ConnectionTimer;
+import org.apache.river.jeri.internal.http.HttpServerConnection;
+import org.apache.river.jeri.internal.http.HttpServerManager;
+import org.apache.river.jeri.internal.http.HttpSettings;
+import org.apache.river.logging.Levels;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -204,7 +204,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"
@@ -268,7 +268,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>
@@ -276,7 +276,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}.
@@ -299,20 +299,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
@@ -320,13 +320,13 @@ import net.jini.security.SecurityContext
* the JSSE implementation. Suites appearing earlier in the list will be
* preferred to ones appearing later for suites that support the same
* requirements and preferences.
- * <li> <code>com.sun.jini.jeri.https.idleServerConnectionTimeout</code> - The
+ * <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 number of
+ * <li> <code>org.apache.river.jeri.https.responseAckTimeout</code> - The number of
* milliseconds to wait for acknowledgments from {@link
* AcknowledgmentSource} instances. The default is <code>15000</code>.
* </ul>
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/ServerAuthManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/ServerAuthManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/ServerAuthManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/ServerAuthManager.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.lang.ref.Reference;
import java.lang.ref.SoftReference;
import java.net.Socket;
Modified: incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslConnection.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslConnection.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslConnection.java (original)
+++ incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslConnection.java Sat Jan 15 12:03:35 2011
@@ -18,9 +18,9 @@
package net.jini.jeri.ssl;
-import com.sun.jini.action.GetLongAction;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.action.GetLongAction;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -66,7 +66,7 @@ class SslConnection extends Utilities im
*/
private static long maxClientSessionDuration =
((Long) Security.doPrivileged(
- new GetLongAction("com.sun.jini.jeri.ssl.maxClientSessionDuration",
+ new GetLongAction("org.apache.river.jeri.ssl.maxClientSessionDuration",
(long) (23.5 * 60 * 60 * 1000)))).longValue();
/** Client logger */