diff --git a/VerteilteSysteme-Examples/build/RMIEchoServer.jar b/VerteilteSysteme-Examples/build/RMIEchoServer.jar index 740f9a3fd6983259aabe0177e57b7562adf9a32c..851a951d10161484f736fd11cf82b7c49f6ae913 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 45ef78122339c12d18aa17d8b353ae7fcc51e918..6f0a37f7bfa11d7e0ed52e4affe0779c7bddd681 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 2efbcc7435d1a14801f6fb3fcf628b934090fce6..4898508e7314cd9ebac8d13388272d30ca5612a6 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 d7f0dac7b5f5c664186f4f00b4e24b5eade30a23..843fa591589fde03fdc7fd3442ec6bea110b4322 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 1826fd79bda1494eee63a988a27a5a74063aebd1..e45870968ed369400f60dc87af455d26097af74c 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 af3dfaee27e832cbd022f98ed2a9a96b637c2d11..ad191139d25f469f7ce905336077da274eea5f0b 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 ef2f1d887118f7bda7ed4ff536a58a58efd61e84..7e64a4fa5632b3f18fa00a1c2419a16b286f9eb9 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 ae0fdcc74dd213807722162e976409401574d7d5..035b29dc499958e29a66fa8e2ac0f7389f49373f 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 5fe9ceb0d899bd5f931bca61966e001be6904836..98455f9a6e3bc0cd12cca286b84aaa11efa22e05 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 0d6ebf1598128b99db66e72e0524382994b219c5..721a20f781171a1e0ffbda856301285ef0afae28 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 cb486a6e64112190c3a2c7b9c424c12f96c30f7c..6de8e002afc5aaa2493506e0ac060d5f9e418915 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 58af5a1be7b36e64cba6681bc98f519979af6c6a..00f4e0ce587f0336e2e7918a8fc3a9f04e0b59ed 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 "<html><head><title>TCPTimeCounter REST Service</title>" + "<meta http-equiv=\"refresh\" content=\"5\"/></head><body>" + - "<h2>Verteilte Systeme HS Fulda - TCPTimeCounter REST Service</h2>"+ + "<h2>Cloud Computing HS Fulda - TCPTimeCounter REST Service</h2>"+ "<p><b>HTML-Output:</b> " + getCounter() + "</p></body></html>"; } @@ -68,10 +69,10 @@ public class TCPTimeCounterRESTService { currentCounterValue = currentCounterValue + (new Long(input)).longValue(); setCounter(currentCounterValue); return "<html><head><title>TCPTimeCounter REST Service</title></head></body>" + - "<h2>Verteilte Systeme HS Fulda - TCPTimeCounter REST Service</h2>" + + "<h2>Cloud Computing HS Fulda - TCPTimeCounter REST Service</h2>" + "<p><b>HTML-Output:</b> counter increased by " + input + " to " + currentCounterValue + "</p>" + - "<form method=POST action=\"http://" + dnsNameELB + ":36042/counter\">" + + "<form method=POST action=\"http://" + dnsNameELB + ":" + portELBTarget + webContextPath +"\">" + "<input name=\"input\" value=\"\"></form></body></html>"; } diff --git a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterServer.java b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterServer.java index c4559c9b9df89df746c2f756b33368f7557f61eb..29178efb1a6d9cb9dac48d82a3e960fb4220d343 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 5eb4c043ffe124b15725f288f173be30b7c36ca0..20169968ac36d12d592496412e7c808b9c7709d6 100644 --- a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/tcptimecounterrest-test.html +++ b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/tcptimecounterrest-test.html @@ -1,3 +1,3 @@ -<form method=POST action="http://vertsys-elb1-b88aad9416b2929b.elb.eu-central-1.amazonaws.com:36042/counter"> - Enter value to increment VertSys Demo Counter: <input name="input" value=""> +<form method=POST action="http://cloudcomp-loadbalancer-1492513132.eu-central-1.elb.amazonaws.com:36042/counter"> + Enter value to increment HS Fulda Cloud Computing Demo Counter: <input name="input" value=""> </form> \ No newline at end of file