Improved naming

arjantijms · arjantijms · commit 1b47036bf44f · 2018-02-22T00:47:37.000+01:00
diff --git a/jaxrs/README.md b/jaxrs/README.md
@@ -0,0 +1,7 @@
+# Java EE 8 Samples: JAX-RS 2.1#
+
+The [JSR 370](https://www.jcp.org/en/jsr/detail?id=370) specifies the JavaTM API for RESTful Web Services. 
+
+## Samples ##
+
+ - producer
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
@@ -7,13 +7,13 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>sse</artifactId>
+    <artifactId>jaxrs</artifactId>
     <packaging>pom</packaging>
 
-    <name>Java EE 8 Samples: Server Sent Events</name>
+    <name>Java EE 8 Samples: JAX-RS</name>
 
     <modules>
-        <module>producer</module>
+        <module>sse-producer</module>
     </modules>
 
     <dependencies>
diff --git a/jaxrs/sse-producer/pom.xml b/jaxrs/sse-producer/pom.xml
@@ -3,13 +3,11 @@
 
     <parent>
         <groupId>org.javaee8</groupId>
-        <artifactId>sse</artifactId>
+        <artifactId>jaxrs</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>sse-producer</artifactId>
     <packaging>war</packaging>
-    <name>Java EE 8 Samples: Server Sent Events [Producer]</name>
-    <dependencies>
-    </dependencies>
+    <name>Java EE 8 Samples: JAX-RS - SSE Producer</name>
 </project>
diff --git a/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/data/EventData.java b/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/data/EventData.java
@@ -1,4 +1,4 @@
-package org.javaee8.sse.data;
+package org.javaee8.jaxrs.sseproducer.data;
 
 import java.util.Date;
 import java.util.UUID;
diff --git a/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/producer/SseResource.java b/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/producer/SseResource.java
@@ -1,4 +1,4 @@
-package org.javaee8.sse.producer;
+package org.javaee8.jaxrs.sseproducer.producer;
 
 import javax.annotation.PostConstruct;
 import javax.json.bind.Jsonb;
@@ -11,7 +11,8 @@
 import javax.ws.rs.sse.Sse;
 import javax.ws.rs.sse.SseBroadcaster;
 import javax.ws.rs.sse.SseEventSink;
-import org.javaee8.sse.data.EventData;
+
+import org.javaee8.jaxrs.sseproducer.data.EventData;
 
 /**
  * @author Daniel Contreras
diff --git a/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/rest/RestApplication.java b/jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/rest/RestApplication.java
@@ -1,4 +1,4 @@
-package org.javaee8.sse.rest;
+package org.javaee8.jaxrs.sseproducer.rest;
 
 import javax.ws.rs.ApplicationPath;
 import javax.ws.rs.core.Application;
diff --git a/jaxrs/sse-producer/src/main/webapp/index.html b/jaxrs/sse-producer/src/main/webapp/index.html
diff --git a/jaxrs/sse-producer/src/test/java/org/javaee8/jaxrs/sseproducer/SseResourceTest.java b/jaxrs/sse-producer/src/test/java/org/javaee8/jaxrs/sseproducer/SseResourceTest.java
@@ -1,4 +1,4 @@
-package org.javaee8.sse.producer;
+package org.javaee8.jaxrs.sseproducer;
 
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
 
@@ -9,6 +9,9 @@
 import javax.json.bind.Jsonb;
 import javax.json.bind.JsonbBuilder;
 
+import org.javaee8.jaxrs.sseproducer.data.EventData;
+import org.javaee8.jaxrs.sseproducer.producer.SseResource;
+import org.javaee8.jaxrs.sseproducer.rest.RestApplication;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
@@ -24,8 +27,6 @@
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.sse.SseEventSource;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import org.javaee8.sse.data.EventData;
-import org.javaee8.sse.rest.RestApplication;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
diff --git a/pom.xml b/pom.xml
@@ -101,7 +101,7 @@
     <modules>
         <module>test-utils</module>
         <module>servlet</module>
-        <module>sse</module>
+        <module>jaxrs</module>
         <module>security</module>
         <module>jsf</module>
         <module>cdi</module>
diff --git a/sse/README.md b/sse/README.md

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.javaee8.sse.data;`
	`1`	`+package org.javaee8.jaxrs.sseproducer.data;`
`2`	`2`
`3`	`3`	`import java.util.Date;`
`4`	`4`	`import java.util.UUID;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.javaee8.sse.rest;`
	`1`	`+package org.javaee8.jaxrs.sseproducer.rest;`
`2`	`2`
`3`	`3`	`import javax.ws.rs.ApplicationPath;`
`4`	`4`	`import javax.ws.rs.core.Application;`