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 [1/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...

Author: peter_firmstone
Date: Sat Jan 15 12:03:35 2011
New Revision: 1059307

URL: http://svn.apache.org/viewvc?rev=1059307&view=rev
Log:
River-261 update namespace references

Modified:
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/lookup/entry/UIDescriptor.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/admin/DestroyAdmin.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/admin/StorageLocationAdmin.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLease.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLeaseMap.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/Landlord.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLease.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLeaseMap.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordProxyVerifier.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/package.html
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/AbstractLease.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/AbstractLeaseMap.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/BasicRenewalFailureEvent.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/package.html
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/entry/BasicServiceType.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMap.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMapEntry.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentSet.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/BasicProxyTrustVerifier.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/ConstrainableProxyUtil.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/MarshalledWrapper.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/ThrowThis.java
    incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/start/ServiceProxyAccessor.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscovery.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscoveryManager.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupLocatorDiscovery.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lease/LeaseRenewalManager.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/JoinManager.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ServiceDiscoveryManager.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/Locales.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/RequiredPackages.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/UIFactoryTypes.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/config/Component.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/config/Config.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/ThrowableConstants.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/TimeConstants.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/TxnConstants.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/VersionConstants.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/FixedLeasePeriodPolicy.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LandlordUtil.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeaseFactory.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasePeriodPolicy.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LeasedResource.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/landlord/LocalLandlord.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/lookup/entry/LookupAttributes.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/phoenix/ActivationAdmin.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogException.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogHandler.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogInputStream.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/LogOutputStream.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/reliableLog/ReliableLog.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/start/LifeCycle.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InProgress.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/InterruptedStatusThread.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadersWriter.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/ReadyState.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/RetryTask.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/StreamPlugThread.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/TaskManager.java
    incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/thread/WakeupManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivatableInvocationHandler.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/activation/ActivationGroup.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/AbstractConfiguration.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationFile.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/ConfigurationProvider.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/EmptyConfiguration.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/config/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/core/discovery/LookupLocator.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/discovery/ConstrainableLookupLocator.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/export/ServerContext.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/iiop/IiopExporter.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/AbstractILFactory.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationDispatcher.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicInvocationHandler.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicJeriExporter.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/BasicObjectEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ConnectionManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/connection/ServerConnectionManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/HttpServerEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/http/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosServerEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/KerberosUtil.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/kerberos/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/AuthManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/FilterX509TrustManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/HttpsServerEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/ServerAuthManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslConnection.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslEndpointImpl.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/SslServerEndpointImpl.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/Utilities.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/ssl/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/TcpServerEndpoint.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jeri/tcp/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpExporter.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/jrmp/JrmpServerContext.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassLoader.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/loader/pref/PreferredClassProvider.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/Security.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustExporter.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustInvocationHandler.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/security/proxytrust/ProxyTrustVerifier.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/Handler.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/MdInputStream.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/net/jini/url/httpmd/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetBooleanAction.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetIntegerAction.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetLongAction.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/action/GetPropertyAction.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/SoftCache.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakKeyReference.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakSoftTable.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/WeakTable.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/collection/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/ConfigUtil.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/config/KeyStores.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientPermissionChecker.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ClientSubjectChecker.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DatagramBufferFactory.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastAnnouncementDecoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DelayedMulticastRequestDecoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/Discovery.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraintTrustVerifier.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryConstraints.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryFormatProvider.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolException.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryProtocolVersion.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV1.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/DiscoveryV2.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/EncodeIterator.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncement.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementDecoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastAnnouncementEncoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastMaxPacketSize.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequest.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestDecoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastRequestEncoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/MulticastTimeToLive.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryClient.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastDiscoveryServer.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastResponse.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/UnicastSocketTimeout.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/BaseProvider.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedClient.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedProvider.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointBasedServer.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternals.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/EndpointInternalsPermission.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/KerberosEndpointInternalsAccess.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/MultiIPDiscovery.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/Plaintext.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/SslEndpointInternalsAccess.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/X500Client.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/X500Constraints.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/X500Provider.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/internal/X500Server.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/kerberos/Client.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/kerberos/Server.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/kerberos/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/plaintext/Client.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/plaintext/Server.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/plaintext/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ssl/Client.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ssl/Server.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/ssl/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/x500/sha1withdsa/Client.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/x500/sha1withdsa/Constants.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/x500/sha1withdsa/Server.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/x500/sha1withdsa/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/x500/sha1withrsa/Client.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/x500/sha1withrsa/Constants.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/x500/sha1withrsa/Server.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/discovery/x500/sha1withrsa/package.html
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/connection/BasicConnManagerFactory.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/connection/BasicServerConnManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/connection/ConnManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/connection/ConnManagerFactory.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/connection/ServerConnManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/ConnectionTimer.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/Header.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/HttpClientConnection.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/HttpClientManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/HttpClientSocketFactory.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/HttpParseException.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/HttpServerConnection.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/HttpServerManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/HttpSettings.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/MessageReader.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/MessageWriter.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/Request.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/ServerInfo.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/StartLine.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/TimedConnection.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/http/TimedMap.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/ConnectionIO.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/IOFuture.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/Mux.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/MuxClient.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/MuxServer.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/ProtocolException.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/Session.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/SocketChannelConnectionIO.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/mux/StreamConnectionIO.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/AbstractDgcClient.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/BASE64Encoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/BasicExportTable.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/CharacterEncoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/DgcClient.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/DgcServer.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/HexDumpEncoder.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/ImplRefManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/Jeri.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/ObjectTable.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SameClassKey.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/SelectionManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/Util.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/jeri/internal/runtime/WeakKey.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/loader/pref/internal/PreferredResources.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/Levels.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogManager.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/logging/LogUtil.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/resource/Service.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/resource/ServiceConfigurationError.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/Executor.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/GetThreadPoolAction.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/NewThreadAction.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/ThreadPool.java
    incubator/river/jtsk/skunk/modules/river-platform/src/main/java/org/apache/river/thread/ThreadPoolPermission.java
    incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/GrantPermission.java
    incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/DynamicPolicyProvider.java
    incubator/river/jtsk/skunk/modules/river-policy/src/main/java/net/jini/security/policy/PolicyFileProvider.java
    incubator/river/jtsk/skunk/modules/river-policy/src/main/java/org/apache/river/collection/WeakIdentityMap.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ActivateWrapper.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/AggregatePolicyProvider.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ClassLoaderUtil.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/HTTPDStatus.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/LoaderSplitPolicyProvider.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/NonActivatableServiceDescriptor.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceDescriptor.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/ServiceStarter.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivatableServiceDescriptor.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivationGroupDescriptor.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/SharedActivationPolicyPermission.java
    incubator/river/jtsk/skunk/modules/river-start/src/main/java/org/apache/river/start/package.html

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/discovery/RemoteDiscoveryEvent.java Sat Jan 15 12:03:35 2011
@@ -30,7 +30,7 @@ import net.jini.core.event.RemoteEvent;
 import net.jini.core.lookup.ServiceRegistrar;
 import net.jini.io.MarshalledInstance;
 
-import com.sun.jini.proxy.MarshalledWrapper;
+import org.apache.river.proxy.MarshalledWrapper;
 
 /**
  * Whenever the lookup discovery service discovers or discards a lookup

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/lookup/entry/UIDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/lookup/entry/UIDescriptor.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/lookup/entry/UIDescriptor.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/net/jini/lookup/entry/UIDescriptor.java Sat Jan 15 12:03:35 2011
@@ -23,7 +23,7 @@ import java.rmi.MarshalledObject;
 import java.io.IOException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import com.artima.lookup.util.ConsistentSet;
+import org.apache.river.lookup.util.ConsistentSet;
 
 /**
  * <CODE>Entry</CODE> that enables a UI for a service to be associated

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/admin/DestroyAdmin.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/admin/DestroyAdmin.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/admin/DestroyAdmin.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/admin/DestroyAdmin.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.sun.jini.admin;
+package org.apache.river.admin;
 
 /**
  * Admin interface for destroying a service.  Administrable services are

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

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLease.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLease.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLease.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLease.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.lang.reflect.Method;
 import java.io.IOException;
@@ -28,7 +28,7 @@ import net.jini.security.proxytrust.Prox
 import net.jini.security.proxytrust.SingletonProxyTrustIterator;
 import net.jini.id.Uuid;
 import net.jini.id.ReferentUuid;
-import com.sun.jini.proxy.ConstrainableProxyUtil;
+import org.apache.river.proxy.ConstrainableProxyUtil;
 
 /**
  * Constrainable sub-class of <code>LandlordLease</code>.
@@ -54,7 +54,7 @@ final public class ConstrainableLandlord
      * <p>
      * This method is convenient for the initialization of a static
      * variable for use as the <code>mappings</code> argument to 
-     * {@link com.sun.jini.proxy.ConstrainableProxyUtil#translateConstraints 
+     * {@link org.apache.river.proxy.ConstrainableProxyUtil#translateConstraints 
      * ConstrainableProxyUtil.translateConstraints}.
      *
      * @param type           the <code>Class</code> type that defines the

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLeaseMap.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLeaseMap.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLeaseMap.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/ConstrainableLandlordLeaseMap.java Sat Jan 15 12:03:35 2011
@@ -15,14 +15,14 @@
  * 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.constraint.MethodConstraints;
 import net.jini.core.constraint.RemoteMethodControl;
 import net.jini.id.Uuid;
 import net.jini.id.ReferentUuid;
-import com.sun.jini.proxy.ConstrainableProxyUtil;
+import org.apache.river.proxy.ConstrainableProxyUtil;
 
 /**
  * Constrainable sub-class of <code>LandlordLeaseMap</code>.

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/Landlord.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/Landlord.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/Landlord.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/Landlord.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.rmi.Remote;
 import java.rmi.RemoteException;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLease.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLease.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLease.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLease.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.io.ObjectInputStream;
 import java.io.IOException;
@@ -29,7 +29,7 @@ import net.jini.core.lease.UnknownLeaseE
 import net.jini.id.Uuid;
 import net.jini.id.ReferentUuid;
 import net.jini.id.ReferentUuids;
-import com.sun.jini.lease.AbstractLease;
+import org.apache.river.lease.AbstractLease;
 
 /**
  * Basic implementation of <code>net.jini.core.lease.Lease</code> that works

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLeaseMap.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLeaseMap.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLeaseMap.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordLeaseMap.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.landlord;
+package org.apache.river.landlord;
 
-import com.sun.jini.lease.AbstractLeaseMap;
+import org.apache.river.lease.AbstractLeaseMap;
 import java.rmi.RemoteException;
 import java.util.Map;
 import java.util.Iterator;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordProxyVerifier.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordProxyVerifier.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordProxyVerifier.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/LandlordProxyVerifier.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.MethodConstraints;
 import net.jini.core.constraint.RemoteMethodControl;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/landlord/package.html Sat Jan 15 12:03:35 2011
@@ -21,7 +21,7 @@
 
 <P>
 This is a utility for services implementing leases.  The {@link
-com.sun.jini.landlord.Landlord} is the basic interface that defines the
+org.apache.river.landlord.Landlord} is the basic interface that defines the
 utility.  A service that exports leases implements the
 <CODE>Landlord</CODE> interface, which is used for callbacks by the utility
 classes when a lease's status changes.  Each leased resource is identified
@@ -31,21 +31,21 @@ cookie, and that cookie is used when com
 the lease.
 <P>
 The utility classes define a lease object type {@link
-com.sun.jini.landlord.LandlordLease}.  The <CODE>Lease</CODE> objects
+org.apache.river.landlord.LandlordLease}.  The <CODE>Lease</CODE> objects
 handed to clients will be of this type.  <CODE>LandlordLease</CODE> objects
 talk to the <CODE>Landlord</CODE> about the lease.  A factory class, {@link
-com.sun.jini.landlord.LeaseFactory}, can be used to generate new
+org.apache.river.landlord.LeaseFactory}, can be used to generate new
 leases. The package also contains a constrainable implementation of
 <code>Lease</code>, {@link
-com.sun.jini.landlord.ConstrainableLandlordLease}, that implements
+org.apache.river.landlord.ConstrainableLandlordLease}, that implements
 {@link net.jini.core.constraint.RemoteMethodControl} and supports proxy
 trust verification (when used with {@link
-com.sun.jini.landlord.LandlordProxyVerifier}) and suitable implementations
+org.apache.river.landlord.LandlordProxyVerifier}) and suitable implementations
 of {@link net.jini.core.lease.LeaseMap}. It also contains utilities and
 interfaces to assist you in implementing the <code>Landlord</code>
-interfaces: {@link com.sun.jini.landlord.LandlordUtil}, {@link
-com.sun.jini.landlord.LeasePeriodPolicy}, and {@link
-com.sun.jini.landlord.FixedLeasePeriodPolicy}.
+interfaces: {@link org.apache.river.landlord.LandlordUtil}, {@link
+org.apache.river.landlord.LeasePeriodPolicy}, and {@link
+org.apache.river.landlord.FixedLeasePeriodPolicy}.
 <P>
 Using the classes in this package, you can write services that export
 leases and handle primarily those factors that are unique to your service,

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

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/AbstractLeaseMap.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/AbstractLeaseMap.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/AbstractLeaseMap.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/AbstractLeaseMap.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.lease;
+package org.apache.river.lease;
 
 import java.util.Map;
 import java.util.Set;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/BasicRenewalFailureEvent.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/BasicRenewalFailureEvent.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/BasicRenewalFailureEvent.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/BasicRenewalFailureEvent.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.lease;
+package org.apache.river.lease;
 
-import com.sun.jini.proxy.MarshalledWrapper;
+import org.apache.river.proxy.MarshalledWrapper;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.rmi.MarshalledObject;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/package.html
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/package.html?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/package.html (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lease/package.html Sat Jan 15 12:03:35 2011
@@ -22,7 +22,7 @@
 Some basic utility classes for helping with
 client-side lease renewal operations.
 
-@see com.sun.jini.landlord
+@see org.apache.river.landlord
 @see net.jini.lookup.JoinManager
 
 </BODY>

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/entry/BasicServiceType.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/entry/BasicServiceType.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/entry/BasicServiceType.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/entry/BasicServiceType.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.lookup.entry;
+package org.apache.river.lookup.entry;
 
 import java.awt.Image;
 import java.util.ResourceBundle;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMap.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMap.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMap.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMap.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.artima.lookup.util;
+package org.apache.river.lookup.util;
 
 import java.util.Map;
 import java.util.Set;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMapEntry.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMapEntry.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMapEntry.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentMapEntry.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.artima.lookup.util;
+package org.apache.river.lookup.util;
 
 import java.util.Map;
 import java.io.Serializable;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentSet.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentSet.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentSet.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/lookup/util/ConsistentSet.java Sat Jan 15 12:03:35 2011
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package com.artima.lookup.util;
+package org.apache.river.lookup.util;
 
 import java.util.HashSet;
 import java.util.Collection;

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

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

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/MarshalledWrapper.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/MarshalledWrapper.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/MarshalledWrapper.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/MarshalledWrapper.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.proxy;
+package org.apache.river.proxy;
 
 import java.io.IOException;
 import java.io.InvalidObjectException;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/ThrowThis.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/ThrowThis.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/ThrowThis.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/proxy/ThrowThis.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.proxy;
+package org.apache.river.proxy;
 
 import java.rmi.RemoteException;
 

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/start/ServiceProxyAccessor.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/start/ServiceProxyAccessor.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/start/ServiceProxyAccessor.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-dl/src/main/java/org/apache/river/start/ServiceProxyAccessor.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.rmi.RemoteException;
 
@@ -45,8 +45,8 @@ import java.rmi.RemoteException;
  *
  * @since 2.0
  *
- * @see com.sun.jini.start.NonActivatableServiceDescriptor
- * @see com.sun.jini.start.SharedActivatableServiceDescriptor
+ * @see org.apache.river.start.NonActivatableServiceDescriptor
+ * @see org.apache.river.start.SharedActivatableServiceDescriptor
  * @see java.rmi.activation.ActivationID
  *
  **/

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscovery.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscovery.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscovery.java Sat Jan 15 12:03:35 2011
@@ -17,20 +17,20 @@
  */
 package net.jini.discovery;
 
-import com.sun.jini.config.Config;
-import com.sun.jini.discovery.Discovery;
-import com.sun.jini.discovery.DiscoveryConstraints;
-import com.sun.jini.discovery.DiscoveryProtocolException;
-import com.sun.jini.discovery.EncodeIterator;
-import com.sun.jini.discovery.MulticastAnnouncement;
-import com.sun.jini.discovery.MulticastRequest;
-import com.sun.jini.discovery.UnicastResponse;
-import com.sun.jini.discovery.internal.MultiIPDiscovery;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
-import com.sun.jini.thread.TaskManager;
-import com.sun.jini.thread.WakeupManager;
-import com.sun.jini.thread.WakeupManager.Ticket;
+import org.apache.river.config.Config;
+import org.apache.river.discovery.Discovery;
+import org.apache.river.discovery.DiscoveryConstraints;
+import org.apache.river.discovery.DiscoveryProtocolException;
+import org.apache.river.discovery.EncodeIterator;
+import org.apache.river.discovery.MulticastAnnouncement;
+import org.apache.river.discovery.MulticastRequest;
+import org.apache.river.discovery.UnicastResponse;
+import org.apache.river.discovery.internal.MultiIPDiscovery;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
+import org.apache.river.thread.TaskManager;
+import org.apache.river.thread.WakeupManager;
+import org.apache.river.thread.WakeupManager.Ticket;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.DatagramPacket;
@@ -90,7 +90,7 @@ import net.jini.security.SecurityContext
  * to lookup services - based on no information other than lookup service
  * group membership - much simpler for both services and clients.
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * The following implementation-specific items are discussed below:
  * <ul><li> <a href="#ldConfigEntries">Configuring LookupDiscovery</a>
@@ -134,13 +134,13 @@ import net.jini.security.SecurityContext
  *         	{@link MethodConstraints#getConstraints getConstraints} on the
  *         	obtained <code>MethodConstraints</code> instance with a
  *         	<code>Method</code> object for the
- *    {@link com.sun.jini.discovery.DiscoveryConstraints#multicastRequest
+ *    {@link org.apache.river.discovery.DiscoveryConstraints#multicastRequest
  *              multicastRequest} method; multicast announcement and unicast
  *              discovery constraints are similarly obtained by passing
  *              <code>Method</code> objects for the
- *    {@link com.sun.jini.discovery.DiscoveryConstraints#multicastAnnouncement
+ *    {@link org.apache.river.discovery.DiscoveryConstraints#multicastAnnouncement
  *              multicastAnnouncement} and
- *    {@link com.sun.jini.discovery.DiscoveryConstraints#unicastDiscovery
+ *    {@link org.apache.river.discovery.DiscoveryConstraints#unicastDiscovery
  *              unicastDiscovery} methods, respectively.  A <code>null</code>
  *              value is interpreted as	mapping all methods to empty
  *              constraints.
@@ -148,19 +148,19 @@ import net.jini.security.SecurityContext
  *         	This class supports the use of the following constraint types
  *              to control discovery behavior:
  *         	<ul>
- *         	  <li> {@link com.sun.jini.discovery.DiscoveryProtocolVersion}:
+ *         	  <li> {@link org.apache.river.discovery.DiscoveryProtocolVersion}:
  *         	       this constraint can be used to control which version(s)
  *         	       of the multicast request, multicast announcement and
  *         	       unicast discovery protocols are used.
- *         	  <li> {@link com.sun.jini.discovery.MulticastMaxPacketSize}:
+ *         	  <li> {@link org.apache.river.discovery.MulticastMaxPacketSize}:
  *         	       this constraint can be used to control the maximum size
  *         	       of multicast request packets to send; it can also be
  *         	       used to specify the size of the buffer used to receive
  *         	       incoming multicast announcement packets.
- *         	  <li> {@link com.sun.jini.discovery.MulticastTimeToLive}: this
+ *         	  <li> {@link org.apache.river.discovery.MulticastTimeToLive}: this
  *         	       constraint can be used to control the time to live (TTL)
  *         	       value set on outgoing multicast request packets.
- *         	  <li> {@link com.sun.jini.discovery.UnicastSocketTimeout}:
+ *         	  <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.
@@ -425,11 +425,11 @@ import net.jini.security.SecurityContext
  *     <code>taskManager</code></font>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
- *     Type: <td> {@link com.sun.jini.thread.TaskManager}
+ *     Type: <td> {@link org.apache.river.thread.TaskManager}
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Default: <td> <code>new 
- *             {@link com.sun.jini.thread.TaskManager#TaskManager()
+ *             {@link org.apache.river.thread.TaskManager#TaskManager()
  *                                   TaskManager}(15, (15*1000), 1.0f)</code>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
@@ -477,14 +477,14 @@ import net.jini.security.SecurityContext
  *     <code>wakeupManager</code></font>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
- *     Type: <td> {@link com.sun.jini.thread.WakeupManager}
+ *     Type: <td> {@link org.apache.river.thread.WakeupManager}
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Default: <td> <code>new 
- *     {@link com.sun.jini.thread.WakeupManager#WakeupManager(
- *          com.sun.jini.thread.WakeupManager.ThreadDesc)
+ *     {@link org.apache.river.thread.WakeupManager#WakeupManager(
+ *          org.apache.river.thread.WakeupManager.ThreadDesc)
  *     WakeupManager}(new 
- *     {@link com.sun.jini.thread.WakeupManager.ThreadDesc}(null,true))</code>
+ *     {@link org.apache.river.thread.WakeupManager.ThreadDesc}(null,true))</code>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Description:
@@ -603,7 +603,7 @@ import net.jini.security.SecurityContext
  *   </td>
  * </tr>
  * <tr>
- *    <td>{@link com.sun.jini.logging.Levels#FAILED FAILED}</td>
+ *    <td>{@link org.apache.river.logging.Levels#FAILED FAILED}</td>
  *    <td>
  *      when an <code>UnknownHostException</code> occurs while determining
  *      the <code>multicastRequestHost</code>, but the caller does not have
@@ -612,7 +612,7 @@ import net.jini.security.SecurityContext
  *      is logged
  *    </td>
  * <tr>
- *   <td>{@link com.sun.jini.logging.Levels#HANDLED HANDLED}</td>
+ *   <td>{@link org.apache.river.logging.Levels#HANDLED HANDLED}</td>
  *   <td>
  *     when this utility is configured to use all network interfaces enabled
  *     in the system, if one of those interfaces is bad or not configured for
@@ -623,14 +623,14 @@ import net.jini.security.SecurityContext
  *   </td>
  * </tr>
  * <tr>
- *   <td>{@link com.sun.jini.logging.Levels#HANDLED HANDLED}</td>
+ *   <td>{@link org.apache.river.logging.Levels#HANDLED HANDLED}</td>
  *   <td>
  *     when any exception occurs while attempting to unmarshal an incoming
  *     multicast announcement
  *   </td>
  * </tr>
  * <tr>
- *   <td>{@link com.sun.jini.logging.Levels#HANDLED HANDLED}</td>
+ *   <td>{@link org.apache.river.logging.Levels#HANDLED HANDLED}</td>
  *   <td>
  *     when an <code>UnsupportedConstraintException</code> occurs while
  *     marshalling an outgoing multicast request, indicating that the provider
@@ -638,7 +638,7 @@ import net.jini.security.SecurityContext
  *   </td>
  * </tr>
  * <tr>
- *   <td>{@link com.sun.jini.logging.Levels#HANDLED HANDLED}</td>
+ *   <td>{@link org.apache.river.logging.Levels#HANDLED HANDLED}</td>
  *   <td>
  *     when an <code>IOException</code> occurs upon attempting to close the
  *     socket after the thread that listens for multicast responses is asked
@@ -646,7 +646,7 @@ import net.jini.security.SecurityContext
  *   </td>
  * </tr>
  * <tr>
- *   <td>{@link com.sun.jini.logging.Levels#HANDLED HANDLED}</td>
+ *   <td>{@link org.apache.river.logging.Levels#HANDLED HANDLED}</td>
  *   <td>
  *     when an exception is handled during unicast discovery
  *   </td>

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscoveryManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscoveryManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscoveryManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupDiscoveryManager.java Sat Jan 15 12:03:35 2011
@@ -41,7 +41,7 @@ import net.jini.core.lookup.ServiceRegis
  * facilities on their behalf.
  * <p>
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * The following implementation-specific items are discussed below:
  * <ul><li> <a href="#ldmConfigEntries">Configuring LookupDiscoveryManager</a>

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupLocatorDiscovery.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupLocatorDiscovery.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupLocatorDiscovery.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/discovery/LookupLocatorDiscovery.java Sat Jan 15 12:03:35 2011
@@ -17,16 +17,16 @@
  */
 package net.jini.discovery;
 
-import com.sun.jini.config.Config;
-import com.sun.jini.discovery.Discovery;
-import com.sun.jini.discovery.DiscoveryConstraints;
-import com.sun.jini.discovery.UnicastResponse;
-import com.sun.jini.discovery.internal.MultiIPDiscovery;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogUtil;
-import com.sun.jini.thread.RetryTask;
-import com.sun.jini.thread.TaskManager;
-import com.sun.jini.thread.WakeupManager;
+import org.apache.river.config.Config;
+import org.apache.river.discovery.Discovery;
+import org.apache.river.discovery.DiscoveryConstraints;
+import org.apache.river.discovery.UnicastResponse;
+import org.apache.river.discovery.internal.MultiIPDiscovery;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogUtil;
+import org.apache.river.thread.RetryTask;
+import org.apache.river.thread.TaskManager;
+import org.apache.river.thread.WakeupManager;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.net.InetAddress;
@@ -72,7 +72,7 @@ import net.jini.security.ProxyPreparer;
  * or its subclass {@link net.jini.discovery.ConstrainableLookupLocator
  * ConstrainableLookupLocator}.
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * The following implementation-specific items are discussed below:
  * <ul><li> <a href="#lldConfigEntries">Configuring LookupLocatorDiscovery</a>
@@ -163,11 +163,11 @@ import net.jini.security.ProxyPreparer;
  *     <code>taskManager</code></font>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
- *     Type: <td> {@link com.sun.jini.thread.TaskManager}
+ *     Type: <td> {@link org.apache.river.thread.TaskManager}
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Default: <td> <code>new 
- *             {@link com.sun.jini.thread.TaskManager#TaskManager()
+ *             {@link org.apache.river.thread.TaskManager#TaskManager()
  *                                   TaskManager}(15, (15*1000), 1.0f)</code>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
@@ -190,14 +190,14 @@ import net.jini.security.ProxyPreparer;
  *     <code>wakeupManager</code></font>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
- *     Type: <td> {@link com.sun.jini.thread.WakeupManager}
+ *     Type: <td> {@link org.apache.river.thread.WakeupManager}
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Default: <td> <code>new 
- *     {@link com.sun.jini.thread.WakeupManager#WakeupManager(
- *          com.sun.jini.thread.WakeupManager.ThreadDesc)
+ *     {@link org.apache.river.thread.WakeupManager#WakeupManager(
+ *          org.apache.river.thread.WakeupManager.ThreadDesc)
  *     WakeupManager}(new 
- *     {@link com.sun.jini.thread.WakeupManager.ThreadDesc}(null,true))</code>
+ *     {@link org.apache.river.thread.WakeupManager.ThreadDesc}(null,true))</code>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Description:
@@ -248,7 +248,7 @@ import net.jini.security.ProxyPreparer;
  *   <td>when any exception occurs while attempting to prepare a proxy</td>
  * </tr>
  * <tr>
- *   <td>{@link com.sun.jini.logging.Levels#HANDLED HANDLED}</td>
+ *   <td>{@link org.apache.river.logging.Levels#HANDLED HANDLED}</td>
  *   <td>
  *     when an exception is handled during unicast discovery.
  *   </td>
@@ -666,10 +666,10 @@ public class LookupLocatorDiscovery impl
      *  If a particular instance of this class fails to find the lookup
      *  service that it references, this task will be rescheduled to be
      *  executed again at a later time, using a "backoff strategy" as defined
-     *  by the method <code>com.sun.jini.thread.RetryTask.retryTime</code>.
+     *  by the method <code>org.apache.river.thread.RetryTask.retryTime</code>.
      *
-     *  @see com.sun.jini.thread.RetryTask
-     *  @see com.sun.jini.thread.WakeupManager
+     *  @see org.apache.river.thread.RetryTask
+     *  @see org.apache.river.thread.WakeupManager
      */
     private class DiscoveryTask extends RetryTask {
         private LocatorReg reg;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lease/LeaseRenewalManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lease/LeaseRenewalManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lease/LeaseRenewalManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lease/LeaseRenewalManager.java Sat Jan 15 12:03:35 2011
@@ -18,12 +18,12 @@
 
 package net.jini.lease;
 
-import com.sun.jini.config.Config;
-import com.sun.jini.constants.ThrowableConstants;
-import com.sun.jini.logging.Levels;
-import com.sun.jini.logging.LogManager;
-import com.sun.jini.proxy.ConstrainableProxyUtil;
-import com.sun.jini.thread.TaskManager;
+import org.apache.river.config.Config;
+import org.apache.river.constants.ThrowableConstants;
+import org.apache.river.logging.Levels;
+import org.apache.river.logging.LogManager;
+import org.apache.river.proxy.ConstrainableProxyUtil;
+import org.apache.river.thread.TaskManager;
 import java.lang.reflect.Method;
 import java.rmi.RemoteException;
 import java.util.ArrayList;
@@ -123,7 +123,7 @@ import net.jini.core.lease.UnknownLeaseE
  * @see LeaseException
  * @see LeaseRenewalEvent 
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * The following implementation-specific items are discussed below:
  * <ul>

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/JoinManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/JoinManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/JoinManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/JoinManager.java Sat Jan 15 12:03:35 2011
@@ -17,12 +17,12 @@
  */
 package net.jini.lookup;
 
-import com.sun.jini.constants.ThrowableConstants;
-import com.sun.jini.lookup.entry.LookupAttributes;
-import com.sun.jini.thread.RetryTask;
-import com.sun.jini.thread.TaskManager;
-import com.sun.jini.thread.WakeupManager;
-import com.sun.jini.logging.LogUtil;
+import org.apache.river.constants.ThrowableConstants;
+import org.apache.river.lookup.entry.LookupAttributes;
+import org.apache.river.thread.RetryTask;
+import org.apache.river.thread.TaskManager;
+import org.apache.river.thread.WakeupManager;
+import org.apache.river.logging.LogUtil;
 
 import net.jini.config.Configuration;
 import net.jini.config.ConfigurationException;
@@ -85,7 +85,7 @@ import java.util.logging.Logger;
  * this class will create an instance of this class in the service's address
  * space to manage the entity's join state locally.
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * The following implementation-specific items are discussed below:
  * <ul><li> <a href="#jmConfigEntries">Configuring JoinManager</a>
@@ -286,11 +286,11 @@ import java.util.logging.Logger;
  *     <code>taskManager</code></font>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
- *     Type: <td> {@link com.sun.jini.thread.TaskManager}
+ *     Type: <td> {@link org.apache.river.thread.TaskManager}
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Default: <td> <code>new 
- *             {@link com.sun.jini.thread.TaskManager#TaskManager()
+ *             {@link org.apache.river.thread.TaskManager#TaskManager()
  *                                   TaskManager}(15, (15*1000), 1.0f)</code>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
@@ -313,14 +313,14 @@ import java.util.logging.Logger;
  *     <code>wakeupManager</code></font>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
- *     Type: <td> {@link com.sun.jini.thread.WakeupManager}
+ *     Type: <td> {@link org.apache.river.thread.WakeupManager}
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Default: <td> <code>new 
- *     {@link com.sun.jini.thread.WakeupManager#WakeupManager(
- *          com.sun.jini.thread.WakeupManager.ThreadDesc)
+ *     {@link org.apache.river.thread.WakeupManager#WakeupManager(
+ *          org.apache.river.thread.WakeupManager.ThreadDesc)
  *     WakeupManager}(new 
- *     {@link com.sun.jini.thread.WakeupManager.ThreadDesc}(null,true))</code>
+ *     {@link org.apache.river.thread.WakeupManager.ThreadDesc}(null,true))</code>
  * 
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Description:
@@ -441,7 +441,7 @@ public class JoinManager {
     /** Implementation Note:
      *
      *  This class executes a number of tasks asynchronously. Each task is
-     *  initially queued in a <code>com.sun.jini.thread.TaskManager</code>
+     *  initially queued in a <code>org.apache.river.thread.TaskManager</code>
      *  instance, which executes each task in a separate thread. In this
      *  way, an upper bound is placed on the number of threads executing
      *  concurrently at any one time; that is, the number of concurrent
@@ -497,8 +497,8 @@ public class JoinManager {
      *  
      *  Each main task executed by this join manager's task manager is a
      *  sub-class of the abstract class <code>RetryTask</code>, defined in
-     *  the package <code>com.sun.jini.thread</code>, which implements
-     *  the <code>com.sun.jini.thread.TaskManager.Task</code> interface.
+     *  the package <code>org.apache.river.thread</code>, which implements
+     *  the <code>org.apache.river.thread.TaskManager.Task</code> interface.
      *  The association of each such task with a particular lookup service,
      *  and with a unique sequence number is reflected in the fields of this
      *  class. The unique sequence number associated with each main task
@@ -552,11 +552,11 @@ public class JoinManager {
      *  from its default value by setting the <code>wakeupRetries</code>
      *  configuration entry for this component.
      *
-     *  @see com.sun.jini.thread.TaskManager
-     *  @see com.sun.jini.thread.WakeupManager
-     *  @see com.sun.jini.thread.TaskManager.Task
-     *  @see com.sun.jini.thread.RetryTask
-     *  @see com.sun.jini.constants.ThrowableConstants
+     *  @see org.apache.river.thread.TaskManager
+     *  @see org.apache.river.thread.WakeupManager
+     *  @see org.apache.river.thread.TaskManager.Task
+     *  @see org.apache.river.thread.RetryTask
+     *  @see org.apache.river.constants.ThrowableConstants
      */
 
     /** Abstract base class from which all of the task classes are derived. */

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ServiceDiscoveryManager.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ServiceDiscoveryManager.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ServiceDiscoveryManager.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ServiceDiscoveryManager.java Sat Jan 15 12:03:35 2011
@@ -17,11 +17,11 @@
  */
 package net.jini.lookup;
 
-import com.sun.jini.logging.Levels;
-import com.sun.jini.lookup.entry.LookupAttributes;
-import com.sun.jini.proxy.BasicProxyTrustVerifier;
-import com.sun.jini.thread.TaskManager;
-import com.sun.jini.thread.TaskManager.Task;
+import org.apache.river.logging.Levels;
+import org.apache.river.lookup.entry.LookupAttributes;
+import org.apache.river.proxy.BasicProxyTrustVerifier;
+import org.apache.river.thread.TaskManager;
+import org.apache.river.thread.TaskManager.Task;
 
 import net.jini.config.Configuration;
 import net.jini.config.ConfigurationException;
@@ -196,7 +196,7 @@ import java.util.Set;
  * space to manage the state of discovered services and their associated
  * lookup services locally.
  *
- * @com.sun.jini.impl <!-- Implementation Specifics -->
+ * @org.apache.river.impl <!-- Implementation Specifics -->
  *
  * The following implementation-specific items are discussed below:
  * <ul><li> <a href="#sdmConfigEntries">Configuring ServiceDiscoveryManager</a>
@@ -239,11 +239,11 @@ import java.util.Set;
  *     <code>cacheTaskManager</code></font>
  *
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
- *     Type: <td> {@link com.sun.jini.thread.TaskManager}
+ *     Type: <td> {@link org.apache.river.thread.TaskManager}
  *
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Default: <td> <code>new
- *             {@link com.sun.jini.thread.TaskManager#TaskManager()
+ *             {@link org.apache.river.thread.TaskManager#TaskManager()
  *                                   TaskManager}(10, (15*1000), 1.0f)</code>
  *
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
@@ -270,11 +270,11 @@ import java.util.Set;
  *     <code>discardTaskManager</code></font>
  *
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
- *     Type: <td> {@link com.sun.jini.thread.TaskManager}
+ *     Type: <td> {@link org.apache.river.thread.TaskManager}
  *
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
  *     Default: <td> <code>new
- *             {@link com.sun.jini.thread.TaskManager#TaskManager()
+ *             {@link org.apache.river.thread.TaskManager#TaskManager()
  *                                   TaskManager}(10, (15*1000), 1.0f)</code>
  *
  *   <tr valign="top"> <td> &nbsp <th scope="row" align="right">
@@ -543,14 +543,14 @@ import java.util.Set;
  *   <td>upon failure of the lease renewal process</td>
  * </tr>
  * <tr>
- *   <td>{@link com.sun.jini.logging.Levels#HANDLED HANDLED}</td>
+ *   <td>{@link org.apache.river.logging.Levels#HANDLED HANDLED}</td>
  *   <td>
  *     when an exception occurs because a remote call to a lookup service
  *     has been interrupted as a result of the termination of a cache
  *   </td>
  * </tr>
  * <tr>
- *   <td>{@link com.sun.jini.logging.Levels#HANDLED HANDLED}</td>
+ *   <td>{@link org.apache.river.logging.Levels#HANDLED HANDLED}</td>
  *   <td>
  *     when a "gap" is encountered in an event sequence from a lookup service
  *   </td>
@@ -589,8 +589,8 @@ import java.util.Set;
  * </tr>
  * </table>
  * <p>
- * See the {@link com.sun.jini.logging.LogManager} class for one way to use
- * the logging level {@link com.sun.jini.logging.Levels#HANDLED HANDLED} in
+ * See the {@link org.apache.river.logging.LogManager} class for one way to use
+ * the logging level {@link org.apache.river.logging.Levels#HANDLED HANDLED} in
  * standard logging configuration files.
  * <p>
  *

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/Locales.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/Locales.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/Locales.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/Locales.java Sat Jan 15 12:03:35 2011
@@ -22,7 +22,7 @@ import java.util.Iterator;
 import java.util.Set;
 import java.util.List;
 import java.util.Collections;
-import com.artima.lookup.util.ConsistentSet;
+import org.apache.river.lookup.util.ConsistentSet;
 
 /**
  * UI attribute that lists the locales supported

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/RequiredPackages.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/RequiredPackages.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/RequiredPackages.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/RequiredPackages.java Sat Jan 15 12:03:35 2011
@@ -22,7 +22,7 @@ import java.util.Set;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Collections;
-import com.artima.lookup.util.ConsistentMap;
+import org.apache.river.lookup.util.ConsistentMap;
 
 /**
  * UI attribute that enables clients to get a list of

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/UIFactoryTypes.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/UIFactoryTypes.java?rev=1059307&r1=1059306&r2=1059307&view=diff
==============================================================================
--- incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/UIFactoryTypes.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/net/jini/lookup/ui/attribute/UIFactoryTypes.java Sat Jan 15 12:03:35 2011
@@ -21,7 +21,7 @@ import java.util.Set;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Collections;
-import com.artima.lookup.util.ConsistentSet;
+import org.apache.river.lookup.util.ConsistentSet;
 
 /**
  * UI attribute that lists UI factory interfaces of which a UI factory

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

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

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/ThrowableConstants.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/ThrowableConstants.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/ThrowableConstants.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/ThrowableConstants.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 java.io.ObjectStreamException;
 import java.net.NoRouteToHostException;

Modified: incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/TimeConstants.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/TimeConstants.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/TimeConstants.java (original)
+++ incubator/river/jtsk/skunk/modules/river-libs/river-lib/src/main/java/org/apache/river/constants/TimeConstants.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;
 
 /**
  * Various constants useful in calculating times.