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 2010/05/01 14:53:12 UTC
svn commit: r940002 - in /incubator/river/jtsk/trunk/src/net/jini:
core/lookup/ exception/ exception/rmi/ lookup/
Author: peter_firmstone
Date: Sat May 1 12:53:11 2010
New Revision: 940002
URL: http://svn.apache.org/viewvc?rev=940002&view=rev
Log:
Minor refactoring of new code
Added:
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ConnectIOException.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ExportException.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/MarshalException.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/NoSuchObjectException.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerError.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerException.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerNotActiveException.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnknownHostException.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java
incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnmarshalException.java
- copied, changed from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java
Removed:
incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java
incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java
incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java
incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java
incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java
incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java
incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java
incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java
incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java
Modified:
incubator/river/jtsk/trunk/src/net/jini/core/lookup/StreamServiceRegistrar.java
incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceRegistrarFacade.java
incubator/river/jtsk/trunk/src/net/jini/lookup/StreamServiceRegistrarFacade.java
Modified: incubator/river/jtsk/trunk/src/net/jini/core/lookup/StreamServiceRegistrar.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/core/lookup/StreamServiceRegistrar.java?rev=940002&r1=940001&r2=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/core/lookup/StreamServiceRegistrar.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/core/lookup/StreamServiceRegistrar.java Sat May 1 12:53:11 2010
@@ -120,7 +120,7 @@ public interface StreamServiceRegistrar
* @see ResultStreamUnmarshaller
* @since 2.2.0
*/
- ResultStream<MarshalledServiceItem> lookup(ServiceTemplate tmpl,
+ ResultStream<ServiceItem> lookup(ServiceTemplate tmpl,
Class<? extends Entry>[] unmarshalledEntries, int maxBatchSize) throws RemoteException;
/**
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ConnectIOException.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ConnectIOException.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ConnectIOException.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ConnectIOException.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ConnectIOException.java Sat May 1 12:53:11 2010
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
import java.rmi.RemoteException;
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ExportException.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ExportException.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ExportException.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ExportException.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ExportException.java Sat May 1 12:53:11 2010
@@ -36,7 +36,7 @@
* @author Mikhail A. Markov
* @version $Revision: 1.4.4.2 $
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
import java.rmi.RemoteException;
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/MarshalException.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/MarshalException.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/MarshalException.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/MarshalException.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/MarshalException.java Sat May 1 12:53:11 2010
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
import java.rmi.RemoteException;
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/NoSuchObjectException.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/NoSuchObjectException.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/NoSuchObjectException.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/NoSuchObjectException.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/NoSuchObjectException.java Sat May 1 12:53:11 2010
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
import java.rmi.RemoteException;
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerError.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerError.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerError.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ServerError.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerError.java Sat May 1 12:53:11 2010
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
import java.rmi.RemoteException;
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerException.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerException.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerException.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ServerException.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerException.java Sat May 1 12:53:11 2010
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
import java.rmi.RemoteException;
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerNotActiveException.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerNotActiveException.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerNotActiveException.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/ServerNotActiveException.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/ServerNotActiveException.java Sat May 1 12:53:11 2010
@@ -21,7 +21,7 @@
* @author Mikhail A. Markov
* @version $Revision: 1.4.4.2 $
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
/**
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnknownHostException.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnknownHostException.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnknownHostException.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/UnknownHostException.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnknownHostException.java Sat May 1 12:53:11 2010
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
import java.rmi.RemoteException;
Copied: incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnmarshalException.java (from r939281, incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnmarshalException.java?p2=incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnmarshalException.java&p1=incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java&r1=939281&r2=940002&rev=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/exception/UnmarshalException.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/exception/rmi/UnmarshalException.java Sat May 1 12:53:11 2010
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.jini.exception;
+package net.jini.exception.rmi;
import java.rmi.RemoteException;
Modified: incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceRegistrarFacade.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceRegistrarFacade.java?rev=940002&r1=940001&r2=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceRegistrarFacade.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/lookup/ServiceRegistrarFacade.java Sat May 1 12:53:11 2010
@@ -30,7 +30,7 @@ import net.jini.io.MarshalledInstance;
public class ServiceRegistrarFacade implements ServiceRegistrar, Facade<PortableServiceRegistrar>{
private final PortableServiceRegistrar sr; //Never allow a facade referent.
- private final boolean isStreamingServiceRegistrar;
+ private final boolean isStreamServiceRegistrar;
public ServiceRegistrarFacade(PortableServiceRegistrar psr){
while (psr instanceof Facade){ //always ensure we have uncovered any facades.
@@ -40,16 +40,16 @@ public class ServiceRegistrarFacade impl
}
sr = psr;
if (psr instanceof StreamServiceRegistrar){
- isStreamingServiceRegistrar = true;
+ isStreamServiceRegistrar = true;
} else {
- isStreamingServiceRegistrar = false;
+ isStreamServiceRegistrar = false;
}
}
public EventRegistration notify(ServiceTemplate tmpl, int transitions,
RemoteEventListener listener, MarshalledObject handback,
long leaseDuration) throws RemoteException {
- if ( isStreamingServiceRegistrar ) {
+ if ( isStreamServiceRegistrar ) {
Convert convert = Convert.getInstance();
@SuppressWarnings("unchecked")
MarshalledInstance hback = convert.toMarshalledInstance(handback);
Modified: incubator/river/jtsk/trunk/src/net/jini/lookup/StreamServiceRegistrarFacade.java
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/src/net/jini/lookup/StreamServiceRegistrarFacade.java?rev=940002&r1=940001&r2=940002&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/src/net/jini/lookup/StreamServiceRegistrarFacade.java (original)
+++ incubator/river/jtsk/trunk/src/net/jini/lookup/StreamServiceRegistrarFacade.java Sat May 1 12:53:11 2010
@@ -124,7 +124,7 @@ public class StreamServiceRegistrarFacad
return psr;
}
- public ResultStream<MarshalledServiceItem> lookup(ServiceTemplate tmpl,
+ public ResultStream<ServiceItem> lookup(ServiceTemplate tmpl,
Class<? extends Entry>[] unmarshalledEntries, int maxBatchSize)
throws RemoteException {
if ( psr instanceof StreamServiceRegistrar ){