From 56d67c55bccbf1d9188cce9b3b9c03119e85cc12 Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Mon, 22 Jul 2019 08:47:03 +0200 Subject: [PATCH 1/3] Fixed: Various bugs in Helloworld CDI SE Example (1) README.MD - Sample link misses mandatory parameter (2) pom.xml - Surplus prefix for main class (3) App.java - Surplus base path for root url Signed-off-by: Markus KARG --- examples/helloworld-cdi2-se/README.MD | 2 +- examples/helloworld-cdi2-se/pom.xml | 2 +- .../org/glassfish/jersey/examples/helloworld/cdi2se/App.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/helloworld-cdi2-se/README.MD b/examples/helloworld-cdi2-se/README.MD index 6e4026f9c3..28f14cd49e 100644 --- a/examples/helloworld-cdi2-se/README.MD +++ b/examples/helloworld-cdi2-se/README.MD @@ -31,4 +31,4 @@ Run the example as follows: This deploys the example using [Grizzly](http://grizzly.java.net/) container. -- +- diff --git a/examples/helloworld-cdi2-se/pom.xml b/examples/helloworld-cdi2-se/pom.xml index 3f883d8ad5..dbc3fc7a4b 100644 --- a/examples/helloworld-cdi2-se/pom.xml +++ b/examples/helloworld-cdi2-se/pom.xml @@ -63,7 +63,7 @@ org.codehaus.mojo exec-maven-plugin - java.org.glassfish.jersey.examples.helloworld.cdi2se.App + org.glassfish.jersey.examples.helloworld.cdi2se.App diff --git a/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java b/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java index d35233fa01..d893ddcd63 100644 --- a/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java +++ b/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java @@ -25,7 +25,7 @@ */ public class App { - private static final URI BASE_URI = URI.create("http://localhost:8080/base/"); + private static final URI BASE_URI = URI.create("http://localhost:8080/"); public static final String ROOT_HELLO_PATH = "helloworld"; public static final String ROOT_COUNTER_PATH = "counter"; From c2f33924795bd02ec77b3ffc60b8e5cc2f776fe9 Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Tue, 23 Jul 2019 19:02:45 +0200 Subject: [PATCH 2/3] Copyright (C) 2019 Signed-off-by: Markus KARG --- examples/helloworld-cdi2-se/README.MD | 2 +- .../org/glassfish/jersey/examples/helloworld/cdi2se/App.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/helloworld-cdi2-se/README.MD b/examples/helloworld-cdi2-se/README.MD index 28f14cd49e..839b069217 100644 --- a/examples/helloworld-cdi2-se/README.MD +++ b/examples/helloworld-cdi2-se/README.MD @@ -1,4 +1,4 @@ -[//]: # " Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. " +[//]: # " Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved. " [//]: # " " [//]: # " This program and the accompanying materials are made available under the " [//]: # " terms of the Eclipse Distribution License v. 1.0, which is available at " diff --git a/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java b/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java index d893ddcd63..ec85cfaff9 100644 --- a/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java +++ b/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0, which is available at From b15eb348612ef6ec91e657b6685bf2b83fda20d6 Mon Sep 17 00:00:00 2001 From: Markus KARG Date: Wed, 24 Jul 2019 12:50:06 +0200 Subject: [PATCH 3/3] Fixed: Server outputs wrong root path for helloworld Signed-off-by: Markus KARG --- .../org/glassfish/jersey/examples/helloworld/cdi2se/App.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java b/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java index ec85cfaff9..5608a6de8e 100644 --- a/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java +++ b/examples/helloworld-cdi2-se/src/main/java/org/glassfish/jersey/examples/helloworld/cdi2se/App.java @@ -40,7 +40,7 @@ public static void main(String[] args) { server.start(); System.out.println("Application started.\nTry out"); - System.out.println(String.format("%s%s", BASE_URI, ROOT_HELLO_PATH)); + System.out.println(String.format("%s%s%s", BASE_URI, ROOT_HELLO_PATH, "/Some%Name")); System.out.println(String.format("%s%s%s", BASE_URI, ROOT_COUNTER_PATH, "/request")); System.out.println(String.format("%s%s%s", BASE_URI, ROOT_COUNTER_PATH, "/application")); System.out.println("Stop the application using CTRL+C");