diff --git a/VerteilteSysteme-Examples/build/RMIEchoServer.jar b/VerteilteSysteme-Examples/build/RMIEchoServer.jar index 851a951..ca48150 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 6f0a37f..495fe5a 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 4898508..2259a07 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 843fa59..8709451 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 e458709..fbcc208 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 ad19113..11e2f04 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 7e64a4f..085f00f 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 035b29d..2cd8ced 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 98455f9..35805db 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 721a20f..95fdf25 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/TCPTimeCounterRESTServer.java b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTServer.java index 894f966..5e71b6a 100644 --- a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTServer.java +++ b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTServer.java @@ -1,32 +1,52 @@ /* Beispiel angelehnt an http://www.torsten-horn.de/techdocs/jee-rest.htm */ package verteiltesysteme.aws; +import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.PrintStream; import java.net.URI; + +import org.glassfish.grizzly.http.server.ErrorPageGenerator; import org.glassfish.grizzly.http.server.HttpServer; +import org.glassfish.grizzly.http.server.Request; import org.glassfish.jersey.grizzly2.httpserver.GrizzlyHttpServerFactory; import org.glassfish.jersey.server.ResourceConfig; -public class TCPTimeCounterRESTServer -{ - public static void main( String[] args ) throws IOException, InterruptedException - { - String baseUrl = ( args.length > 0 ) ? args[0] : "http://0.0.0.0:36042"; - - final HttpServer server = GrizzlyHttpServerFactory.createHttpServer( - URI.create( baseUrl ), new ResourceConfig( TCPTimeCounterRESTService.class ), false ); - Runtime.getRuntime().addShutdownHook( new Thread( new Runnable() { - @Override - public void run() { - server.shutdownNow(); - } - } ) ); - server.start(); - - System.out.println("Grizzly-HTTP-Server gestartet"); - System.out.println("Stoppen des Grizzly-HTTP-Servers mit: Strg+C\n"); - System.out.println("RESTful Web Service URL: " + baseUrl + TCPTimeCounterRESTService.webContextPath); - - Thread.currentThread().join(); - } +public class TCPTimeCounterRESTServer { + public static void main(String[] args) throws IOException, InterruptedException { + String baseUrl = (args.length > 0) ? args[0] : "http://0.0.0.0:36042"; + + final HttpServer server = GrizzlyHttpServerFactory.createHttpServer(URI.create(baseUrl), + new ResourceConfig(TCPTimeCounterRESTService.class), false); + Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() { + @Override + public void run() { + server.shutdownNow(); + } + })); + + ErrorPageGenerator epg = new ErrorPageGenerator() { + @Override + public String generate(Request request, int status, String reasonPhrase, String description, + Throwable exception) { + StringBuilder sb = new StringBuilder(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + exception.printStackTrace(ps); + ps.close(); + sb.append(new String(baos.toByteArray())); + System.out.println(sb.toString()); + return sb.toString(); + } + }; + server.getServerConfiguration().setDefaultErrorPageGenerator(epg); + + server.start(); + + System.out.println("Grizzly-HTTP-Server gestartet"); + System.out.println("Stoppen des Grizzly-HTTP-Servers mit: Strg+C\n"); + System.out.println("RESTful Web Service URL: " + baseUrl + TCPTimeCounterRESTService.webContextPath); + + Thread.currentThread().join(); + } } \ No newline at end of file diff --git a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTService.java b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTService.java index 00f4e0c..deba8fd 100644 --- a/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTService.java +++ b/VerteilteSysteme-Examples/src/verteiltesysteme/aws/TCPTimeCounterRESTService.java @@ -14,18 +14,15 @@ public class TCPTimeCounterRESTService { static final String bucketName = "vertsys-counter"; static final String bucketRegion = "eu-central-1"; - static final String dnsNameELB = "cloudcomp-loadbalancer-1492513132.eu-central-1.elb.amazonaws.com"; - static final int portELBTarget = 36042; - private Long getCounter() { // Verbindung zu S3 - AmazonS3 s3Client = AmazonS3ClientBuilder.defaultClient(); + AmazonS3 s3Client = AmazonS3ClientBuilder.standard().withRegion(bucketRegion).build(); return new Long(s3Client.getObjectAsString(bucketName, bucketRegion)); } private boolean setCounter(Long counter) { // Verbindung zu S3 - AmazonS3 s3Client = AmazonS3ClientBuilder.defaultClient(); + AmazonS3 s3Client = AmazonS3ClientBuilder.standard().withRegion(bucketRegion).build(); s3Client.putObject(bucketName, bucketRegion, new Long(counter).toString()); return true; } @@ -41,8 +38,11 @@ public class TCPTimeCounterRESTService { public String getCounterHtml() { return "
HTML-Output: " + getCounter() + "
"; + "HTML-Output: " + getCounter() + "