FE bug fixes and running

3 files changed, 30 insertions, 21 deletions

diff --git a/src/main/java/derms/client/ResponderClient.java b/src/main/java/derms/client/ResponderClient.java
index af5dc3d..78fc327 100644
--- a/src/main/java/derms/client/ResponderClient.java
+++ b/src/main/java/derms/client/ResponderClient.java
@@ -10,16 +10,18 @@ public class ResponderClient extends Client {
     }
 
     public static void main(String[] args) {
-        if (args.length < 1) {
-            System.err.println("Missing argument 'FE host'");
-            System.exit(1);
-        }
+//        if (args.length < 1) {
+//            System.err.println("Missing argument 'FE host'");
+//            System.exit(1);
+//        }
 
-        String FEhost = args[0];
+//        String FEhost = args[0];
+        String FEhost = "localhost";
 
         ResponderClient client = null;
         try {
             client = new ResponderClient(FEhost);
+//            client = new ResponderClient("localhost");
         } catch (MalformedURLException e) {
             System.err.println(e.getMessage());
             System.exit(1);
diff --git a/src/main/java/derms/frontend/DERMSServerImpl.java b/src/main/java/derms/frontend/DERMSServerImpl.java
index 4008278..663bc47 100644
--- a/src/main/java/derms/frontend/DERMSServerImpl.java
+++ b/src/main/java/derms/frontend/DERMSServerImpl.java
@@ -52,10 +52,12 @@ public class DERMSServerImpl implements DERMSInterface {
     
 	@Override
     public synchronized String addResource(String resourceID, String resourceName, int duration) {
+        System.out.println("FE Implementation:addEvent>>> called the method" );
         Request request = new Request("addResource", "");
         request.setResourceID(resourceID);
         request.setResourceType(resourceName);
         request.setDuration(duration);
+        System.out.println("FE Implementation:addEvent>>> set values" );
         request.setSequenceNumber(sendUdpUnicastToSequencer(request));
         System.out.println("FE Implementation:addEvent>>>" + request.toString());
         return validateResponses(request);
@@ -330,7 +332,9 @@ public class DERMSServerImpl implements DERMSInterface {
 
    private int sendUdpUnicastToSequencer(Request request) {
        startTime = System.nanoTime();
+       System.out.println("inside the udp unicast sequencer");
        int sequenceNumber = inter.sendRequestToSequencer(request);
+       System.out.println("after its done the udp unicast sequencer");
        request.setSequenceNumber(sequenceNumber);
        latch = new CountDownLatch(4);
        waitForResponse();
diff --git a/src/main/java/derms/frontend/FE.java b/src/main/java/derms/frontend/FE.java
index af85e6a..c41824f 100644
--- a/src/main/java/derms/frontend/FE.java
+++ b/src/main/java/derms/frontend/FE.java
@@ -9,21 +9,22 @@ import java.net.SocketException;
 import javax.xml.ws.Endpoint;
 import  derms.Request;
 import  derms.Response;
+import java.util.concurrent.atomic.AtomicInteger;
 
 //import constants.Constants;
 
 public class FE {
-    private static final int sequencerPort = 1333;
-    private static final String sequencerIP = "192.168.2.17";
+    private static final int sequencerPort = 3333;
+    private static final String sequencerIP = "localhost";
 //        private static final String sequencerIP = "localhost";
     private static final String RM_Multicast_group_address = "230.1.1.10";
     private static final int FE_SQ_PORT = 1414;
     private static final int FE_PORT = 1999;
     private static final int RM_Multicast_Port = 1234;
     public static String FE_Address = "http://localhost:8067/"+DERMSInterface.class.getSimpleName();
-    private static final String FE_IP_Address = "";
-
+    private static final String FE_IP_Address = "localhost";
 
+    private static AtomicInteger sequenceIDGenerator = new AtomicInteger(0);
 //    public static String FE_IP_Address = "localhost";
 
     public static void main(String[] args) {
@@ -81,7 +82,8 @@ public class FE {
         DatagramSocket aSocket = null;
         String dataFromClient = requestFromClient.toString();
         System.out.println("FE:sendUnicastToSequencer>>>" + dataFromClient);
-        int sequenceID = 0;
+//        int sequenceID = 0;
+        int sequenceID = sequenceIDGenerator.incrementAndGet();
         try {
             aSocket = new DatagramSocket(FE_SQ_PORT);
             byte[] message = dataFromClient.getBytes();
@@ -89,18 +91,19 @@ public class FE {
             DatagramPacket requestToSequencer = new DatagramPacket(message, dataFromClient.length(), aHost, sequencerPort);
 
             aSocket.send(requestToSequencer);
+//            System.out.println("FE:sendUnicastToSequencer/ResponseFromSequencer>>> send is done");
+//            aSocket.setSoTimeout(1000);
+//            // Set up an UPD packet for recieving
+//            byte[] buffer = new byte[1000];
+//            DatagramPacket response = new DatagramPacket(buffer, buffer.length);
+//            // Try to receive the response from the ping
+//            aSocket.receive(response);
+//            String sentence = new String(response.getData(), 0,
+//                    response.getLength());
+//            System.out.println("FE:sendUnicastToSequencer/ResponseFromSequencer>>>" + sentence);
+//            sequenceID = Integer.parseInt(sentence.trim());
+//            System.out.println("FE:sendUnicastToSequencer/ResponseFromSequencer>>>SequenceID:" + sequenceID);
 
-            aSocket.setSoTimeout(1000);
-            // Set up an UPD packet for recieving
-            byte[] buffer = new byte[1000];
-            DatagramPacket response = new DatagramPacket(buffer, buffer.length);
-            // Try to receive the response from the ping
-            aSocket.receive(response);
-            String sentence = new String(response.getData(), 0,
-                    response.getLength());
-            System.out.println("FE:sendUnicastToSequencer/ResponseFromSequencer>>>" + sentence);
-            sequenceID = Integer.parseInt(sentence.trim());
-            System.out.println("FE:sendUnicastToSequencer/ResponseFromSequencer>>>SequenceID:" + sequenceID);
         } catch (SocketException e) {
             System.out.println("Failed: " + requestFromClient.noRequestSendError());
             System.out.println("Socket: " + e.getMessage());