Skip to content

Commit fceceaa

Browse files
stumashstumash
committed
all 'make' commands work
1 parent 71cc281 commit fceceaa

8 files changed

Lines changed: 76 additions & 58 deletions

File tree

‎code/Client/Client/Client.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package Client;
22

3-
import Server.Interface.*;
3+
import Server.Interface.IResourceManager;
44

55
import java.util.*;
66
import java.io.*;

‎code/Client/Client/TCPClient.java‎

Lines changed: 31 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,20 @@
11
package Client;
22

3-
import Server.Interface.*;
3+
import Server.Interface.IResourceManager;
44
import Server.TCP.IProxyResourceManagerGetter;
55
import Server.TCP.Message;
66
import Server.TCP.AbstractProxyObject;
77
import Server.Common.Trace;
88

9-
import java.rmi.registry.LocateRegistry;
10-
import java.rmi.registry.Registry;
11-
import java.rmi.RemoteException;
12-
import java.rmi.NotBoundException;
13-
14-
import java.util.*;
159
import java.io.*;
1610
import java.net.*;
1711

18-
1912
public class TCPClient extends Client implements IProxyResourceManagerGetter
2013
{
2114
private static String s_serverHost = "localhost";
2215
private static int s_serverPort = 2005;
2316
private static String s_serverName = "MiddlewareServer";
2417

25-
//TODO: REPLACE 'ALEX' WITH YOUR GROUP NUMBER TO COMPILE
2618
private static String s_tcpPrefix = "group25_";
2719

2820
public static void main(String args[])
@@ -65,35 +57,40 @@ public TCPClient()
6557
super();
6658
}
6759

60+
@Override
61+
public void connectServer() {
62+
// do nothing, not used
63+
}
64+
6865
public AbstractProxyObject getProxyResourceManager(String hostname, int port, String boundName)
6966
{
70-
Message messageToSend = new Message();
71-
messageToSend.proxyObjectBoundName = s_tcpPrefix + boundName;
72-
while(true) {
73-
try {
74-
Socket socket = new Socket(hostname, port);
67+
Message messageToSend = new Message();
68+
messageToSend.proxyObjectBoundName = s_tcpPrefix + boundName;
69+
while(true) {
70+
try {
71+
Socket socket = new Socket(hostname, port);
7572

76-
ObjectOutputStream objectOutput =
77-
new ObjectOutputStream(socket.getOutputStream());
78-
ObjectInputStream objectInput =
79-
new ObjectInputStream(socket.getInputStream());
73+
ObjectOutputStream objectOutput =
74+
new ObjectOutputStream(socket.getOutputStream());
75+
ObjectInputStream objectInput =
76+
new ObjectInputStream(socket.getInputStream());
8077

81-
objectOutput.writeObject(messageToSend);
82-
try {
83-
return (AbstractProxyObject)objectInput.readObject();
84-
} catch (Exception e) {
85-
Trace.info(s_serverName + ": expected customerRM to be AbstractProxyObject. Cast failed.");
86-
e.printStackTrace();
87-
System.exit(1);
88-
}
89-
} catch (Exception e) {
90-
Trace.info(s_serverName + " waiting for customer server");
91-
try {
92-
Thread.sleep(500);
93-
} catch(Exception err) {
94-
Trace.info("TCPMiddlewareResourceManager::getProxyResourceManager -> Thread sleep failed");
78+
objectOutput.writeObject(messageToSend);
79+
try {
80+
return (AbstractProxyObject)objectInput.readObject();
81+
} catch (Exception e) {
82+
Trace.info(s_serverName + ": expected customerRM to be AbstractProxyObject. Cast failed.");
83+
e.printStackTrace();
84+
System.exit(1);
85+
}
86+
} catch (Exception e) {
87+
Trace.info(s_serverName + " waiting for customer server");
88+
try {
89+
Thread.sleep(500);
90+
} catch(Exception err) {
91+
Trace.info("TCPMiddlewareResourceManager::getProxyResourceManager -> Thread sleep failed");
92+
}
93+
}
9594
}
96-
}
97-
}
9895
}
9996
}

‎code/Client/Makefile‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
1-
all: java.policy compile-client
1+
all: java.policy compile-client compile-client-tcp
22

33
java.policy: FORCE
44
@echo "Creating client java policy"
55
@echo "grant codebase \"file:`pwd`/\" {" > java.policy
66
@echo "permission java.security.AllPermission;" >> java.policy
77
@echo "};" >> java.policy
88

9-
FORCE: ;
9+
compile-client: ../Server/RMIInterface.jar ../Server/Trace.jar ../Server/TCP.jar
10+
javac -cp ../Server/RMIInterface.jar:../Server/Trace.jar:../Server/TCP.jar Client/*.java
1011

1112
../Server/RMIInterface.jar: ../Server/Server/Interface/IResourceManager.java
1213
make -C ../Server/ RMIInterface.jar
1314

14-
compile-client: ../Server/RMIInterface.jar
15-
javac -cp ../Server/RMIInterface.jar Client/*.java
15+
compile-client-tcp: ../Server/TCP.jar ../Server/Trace.jar
16+
javac -cp ../Server/TCP.jar:../Server/Trace.jar:../Server/RMIInterface.jar:. Client/TCPClient.java
17+
18+
../Server/TCP.jar: ../Server/Server/TCP/*.java
19+
make -C ../Server/ TCP.jar
20+
21+
../Server/Trace.jar: ../Server/Server/Common/Trace.java
22+
make -C ../Server/ Trace.jar
1623

1724
clean:
1825
rm -f Client/*.class
1926
rm -f ../Server/RMIInterface.jar
27+
rm -f ../Server
2028
rm -f java.policy
29+
30+
FORCE: ;

‎code/Server/Makefile‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ java.policy: FORCE
88

99
FORCE: ;
1010

11-
RMIInterface.jar: Server/Interface/IResourceManager.java
12-
@echo "Compiling RMI server interface"
13-
javac Server/Interface/IResourceManager.java
14-
jar cvf RMIInterface.jar Server/Interface/IResourceManager.class
15-
1611
compile-server-rmi: Server/RMI/*.java Server/Interface/IResourceManager.java Server/Common/*.java
1712
javac Server/RMI/*.java Server/Interface/IResourceManager.java Server/Common/*.java
1813

@@ -23,4 +18,25 @@ clean:
2318
rm -f Server/Interface/*.class Server/Common/*.class Server/RMI/*.class
2419
rm -f Server/TCP/*.class
2520
rm -f RMIInterface.jar
26-
rm -f java.policy
21+
rm -f java.policy
22+
23+
24+
#---------------
25+
# for Client/Makefile
26+
#---------------
27+
28+
RMIInterface.jar: Server/Interface/IResourceManager.java
29+
@echo "Compiling RMI server interface"
30+
javac Server/Interface/IResourceManager.java
31+
jar cvf RMIInterface.jar Server/Interface/IResourceManager.class
32+
33+
TCP.jar: Server/TCP/*.java
34+
@echo Compiling TCP classes into jar
35+
javac Server/TCP/*.java
36+
jar cvf TCP.jar Server/TCP/*.class
37+
38+
Trace.jar: Server/Common/Trace.java
39+
@echo Compiling Trace.java into jar
40+
javac Server/Common/Trace.java
41+
jar cvf Trace.jar Server/Common/Trace.class
42+

‎code/Server/Server/RMI/RMICustomerResourceManager.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
import Server.Interface.*;
99
import Server.Common.*;
1010

11-
import java.rmi.NotBoundException;
12-
import java.util.*;
13-
1411
import java.rmi.registry.Registry;
1512
import java.rmi.registry.LocateRegistry;
1613
import java.rmi.RemoteException;

‎code/Server/Server/TCP/IProxiable.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package Server.TCP;
22

3-
import java.io.Serializable;
4-
53
public interface IProxiable
64
{
7-
public AbstractProxyObject makeProxyObject(String hostname, int port, String boundName);
5+
public AbstractProxyObject makeProxyObject(String hostname, int port, String boundName);
86
}

‎code/Server/Server/TCP/Message.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public class Message implements Serializable
66
{
7-
String proxyObjectBoundName;
8-
Boolean requestSuccessful;
9-
Object requestedValue;
7+
public String proxyObjectBoundName;
8+
public Boolean requestSuccessful;
9+
public Object requestedValue;
1010
}

‎code/Server/Server/TCP/ProxyMethodCallMessage.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package Server.TCP;
22

33
public class ProxyMethodCallMessage extends Message {
4-
String methodName;
5-
Object[] methodArgs;
6-
Class[] methodArgTypes;
7-
Boolean requestedValueIsCustomer;
4+
public String methodName;
5+
public Object[] methodArgs;
6+
public Class[] methodArgTypes;
7+
public Boolean requestedValueIsCustomer;
88
}

0 commit comments

Comments
 (0)