[brix-cms commit] r44 - trunk/brix-core/src/main/java/brix/workspace/rmi

[codesite...@google.com]

Author: igor.vaynberg
Date: Fri May 16 14:13:16 2008
New Revision: 44

Modified:
trunk/brix-core/src/main/java/brix/workspace/rmi/ServerWorkspace.java
trunk/brix-core/src/main/java/brix/workspace/rmi/ServerWorkspaceManager.java
trunk/brix-core/src/main/java/brix/workspace/rmi/TestRmi.java

Log:
fixed TestRmi

Modified: trunk/brix-core/src/main/java/brix/workspace/rmi/ServerWorkspace.java
==============================================================================
---
trunk/brix-core/src/main/java/brix/workspace/rmi/ServerWorkspace.java (original)
+++
trunk/brix-core/src/main/java/brix/workspace/rmi/ServerWorkspace.java
Fri May 16 14:13:16 2008
@@ -1,17 +1,17 @@
package brix.workspace.rmi;

import java.rmi.RemoteException;
+import java.rmi.server.UnicastRemoteObject;
import java.util.Iterator;

import brix.workspace.Workspace;

-public class ServerWorkspace implements RemoteWorkspace
+public class ServerWorkspace extends UnicastRemoteObject implements RemoteWorkspace
{
private final Workspace delegate;

- public ServerWorkspace(Workspace delegate)
+ public ServerWorkspace(Workspace delegate) throws RemoteException
{
- super();
this.delegate = delegate;
}

Modified: trunk/brix-core/src/main/java/brix/workspace/rmi/ServerWorkspaceManager.java
==============================================================================
---
trunk/brix-core/src/main/java/brix/workspace/rmi/ServerWorkspaceManager.java (original)
+++
trunk/brix-core/src/main/java/brix/workspace/rmi/ServerWorkspaceManager.java
Fri May 16 14:13:16 2008
@@ -39,6 +39,7 @@
}

private static List<RemoteWorkspace> localToRemote(List<Workspace> local)
+ throws RemoteException
{
ArrayList<RemoteWorkspace> remote = new ArrayList<RemoteWorkspace>(local.size());
for (Workspace workspace : local)

Modified: trunk/brix-core/src/main/java/brix/workspace/rmi/TestRmi.java
==============================================================================
--- trunk/brix-core/src/main/java/brix/workspace/rmi/TestRmi.java (original)
+++ trunk/brix-core/src/main/java/brix/workspace/rmi/TestRmi.java Fri
May 16 14:13:16 2008
@@ -25,17 +25,18 @@

EasyMock.replay(remote, workspace);

- Registry registry = LocateRegistry.getRegistry();
+ Registry registry = LocateRegistry.createRegistry(10000);

ServerWorkspaceManager server = new ServerWorkspaceManager(remote);
RemoteStub stub = UnicastRemoteObject.exportObject(server);
registry.rebind("wm", stub);

- ServerWorkspaceManager client = (ServerWorkspaceManager)registry.lookup("wm");
+ RemoteWorkspaceManager client = (RemoteWorkspaceManager)registry.lookup("wm");
WorkspaceManager local = new ClientWorkspaceManager(client);
+
Workspace w = local.createWorkspace();

- EasyMock.verify(server, workspace);
+ EasyMock.verify(remote, workspace);

}