diff --git a/VerteilteSysteme-Examples/build/RMIEchoServer.jar b/VerteilteSysteme-Examples/build/RMIEchoServer.jar index 740f9a3..851a951 100644 Binary files a/VerteilteSysteme-Examples/build/RMIEchoServer.jar and b/VerteilteSysteme-Examples/build/RMIEchoServer.jar differ diff --git a/VerteilteSysteme-Examples/build/RMIMandelbrotCalculationsServer.jar b/VerteilteSysteme-Examples/build/RMIMandelbrotCalculationsServer.jar index 45ef781..6f0a37f 100644 Binary files a/VerteilteSysteme-Examples/build/RMIMandelbrotCalculationsServer.jar and b/VerteilteSysteme-Examples/build/RMIMandelbrotCalculationsServer.jar differ diff --git a/VerteilteSysteme-Examples/build/TCPPerfServer.jar b/VerteilteSysteme-Examples/build/TCPPerfServer.jar index 2efbcc7..4898508 100644 Binary files a/VerteilteSysteme-Examples/build/TCPPerfServer.jar and b/VerteilteSysteme-Examples/build/TCPPerfServer.jar differ diff --git a/VerteilteSysteme-Examples/build/TCPServer.jar b/VerteilteSysteme-Examples/build/TCPServer.jar index d7f0dac..843fa59 100644 Binary files a/VerteilteSysteme-Examples/build/TCPServer.jar and b/VerteilteSysteme-Examples/build/TCPServer.jar differ diff --git a/VerteilteSysteme-Examples/build/TCPServerMulti.jar b/VerteilteSysteme-Examples/build/TCPServerMulti.jar index 1826fd7..e458709 100644 Binary files a/VerteilteSysteme-Examples/build/TCPServerMulti.jar and b/VerteilteSysteme-Examples/build/TCPServerMulti.jar differ diff --git a/VerteilteSysteme-Examples/build/TCPTimeCounterRESTServer.jar b/VerteilteSysteme-Examples/build/TCPTimeCounterRESTServer.jar index af3dfae..ad19113 100644 Binary files a/VerteilteSysteme-Examples/build/TCPTimeCounterRESTServer.jar and b/VerteilteSysteme-Examples/build/TCPTimeCounterRESTServer.jar differ diff --git a/VerteilteSysteme-Examples/build/TCPTimeCounterServer.jar b/VerteilteSysteme-Examples/build/TCPTimeCounterServer.jar index ef2f1d8..7e64a4f 100644 Binary files a/VerteilteSysteme-Examples/build/TCPTimeCounterServer.jar and b/VerteilteSysteme-Examples/build/TCPTimeCounterServer.jar differ diff --git a/VerteilteSysteme-Examples/build/UDPServer.jar b/VerteilteSysteme-Examples/build/UDPServer.jar index ae0fdcc..035b29d 100644 Binary files a/VerteilteSysteme-Examples/build/UDPServer.jar and b/VerteilteSysteme-Examples/build/UDPServer.jar differ diff --git a/VerteilteSysteme-Examples/build/UDPServerMulti.jar b/VerteilteSysteme-Examples/build/UDPServerMulti.jar index 5fe9ceb..98455f9 100644 Binary files a/VerteilteSysteme-Examples/build/UDPServerMulti.jar and b/VerteilteSysteme-Examples/build/UDPServerMulti.jar differ diff --git a/VerteilteSysteme-Examples/build/UDPTimeCounterServer.jar b/VerteilteSysteme-Examples/build/UDPTimeCounterServer.jar index 0d6ebf1..721a20f 100644 Binary files a/VerteilteSysteme-Examples/build/UDPTimeCounterServer.jar and b/VerteilteSysteme-Examples/build/UDPTimeCounterServer.jar differ diff --git a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterClient.java b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterClient.java index cb486a6..6de8e00 100644 --- a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterClient.java +++ b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterClient.java @@ -28,7 +28,7 @@ class TCPTimeCounterClient { } public static void main(String args[]) throws Exception { - String hostname = "VertSys-ELB1-b88aad9416b2929b.elb.eu-central-1.amazonaws.com"; + String hostname = "cloudcomp-loadbalancer-1492513132.eu-central-1.elb.amazonaws.com"; //String hostname = "52.68.46.135"; //String hostname = ""; int tcpPort = 36038; diff --git a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTService.java b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTService.java index 58af5a1..00f4e0c 100644 --- a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTService.java +++ b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTService.java @@ -14,7 +14,8 @@ public class TCPTimeCounterRESTService { static final String bucketName = "vertsys-counter"; static final String bucketRegion = "eu-central-1"; - static final String dnsNameELB = "VertSys-ELB1-b88aad9416b2929b.elb.eu-central-1.amazonaws.com"; + static final String dnsNameELB = "cloudcomp-loadbalancer-1492513132.eu-central-1.elb.amazonaws.com"; + static final int portELBTarget = 36042; private Long getCounter() { // Verbindung zu S3 @@ -40,7 +41,7 @@ public class TCPTimeCounterRESTService { public String getCounterHtml() { return "TCPTimeCounter REST Service" + "" + - "

Verteilte Systeme HS Fulda - TCPTimeCounter REST Service

"+ + "

Cloud Computing HS Fulda - TCPTimeCounter REST Service

"+ "

HTML-Output: " + getCounter() + "

"; } @@ -68,10 +69,10 @@ public class TCPTimeCounterRESTService { currentCounterValue = currentCounterValue + (new Long(input)).longValue(); setCounter(currentCounterValue); return "TCPTimeCounter REST Service" + - "

Verteilte Systeme HS Fulda - TCPTimeCounter REST Service

" + + "

Cloud Computing HS Fulda - TCPTimeCounter REST Service

" + "

HTML-Output: counter increased by " + input + " to " + currentCounterValue + "

" + - "
" + + "" + "
"; } diff --git a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterServer.java b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterServer.java index c4559c9..29178ef 100644 --- a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterServer.java +++ b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterServer.java @@ -76,14 +76,14 @@ class TCPTimeCounterServer { counter = counter + number; s3Client.putObject(bucketName, bucketRegion, new Long(counter).toString()); - System.out.println("Anfrage von Client " + connectionSocket.getInetAddress() + ":" + connectionSocket.getPort() + " Zahl: " + number + " Zählerstand: " + counter); + System.out.println("Request from Client " + connectionSocket.getInetAddress() + ":" + connectionSocket.getPort() + " Zahl: " + number + " Zählerstand: " + counter); // Try/Catch hinzugefügt, nachdem bei Einsatz Amazon AWS (Healthcheck des ELB) clientSentence null war try { // Antwort vom Server senden String output = (Long.toString(counter) + " Zeit: " + System.currentTimeMillis() + " " + df.format(new Date(System.currentTimeMillis())) + " " + InetAddress.getLocalHost()); - System.out.println("Antwort des Servers: " + output); + System.out.println("Reply from Server: " + output); // Zeilenumbruch anfügen, da Client mit readLine auf komplette Zeile wartet outToClient.writeBytes(output + '\n'); } catch (IOException ioe) { diff --git a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/tcptimecounterrest-test.html b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/tcptimecounterrest-test.html index 5eb4c04..2016996 100644 --- a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/tcptimecounterrest-test.html +++ b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/tcptimecounterrest-test.html @@ -1,3 +1,3 @@ -
- Enter value to increment VertSys Demo Counter: + + Enter value to increment HS Fulda Cloud Computing Demo Counter:
\ No newline at end of file