Skip to content

Commit 1b47036

Browse files
arjantijmsarjantijms
committed
Improved naming
1 parent 50b93d3 commit 1b47036

10 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎jaxrs/README.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Java EE 8 Samples: JAX-RS 2.1#
2+
3+
The [JSR 370](https://www.jcp.org/en/jsr/detail?id=370) specifies the JavaTM API for RESTful Web Services.
4+
5+
## Samples ##
6+
7+
- producer

sse/pom.xml renamed to jaxrs/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<version>1.0-SNAPSHOT</version>
88
</parent>
99

10-
<artifactId>sse</artifactId>
10+
<artifactId>jaxrs</artifactId>
1111
<packaging>pom</packaging>
1212

13-
<name>Java EE 8 Samples: Server Sent Events</name>
13+
<name>Java EE 8 Samples: JAX-RS</name>
1414

1515
<modules>
16-
<module>producer</module>
16+
<module>sse-producer</module>
1717
</modules>
1818

1919
<dependencies>

sse/producer/pom.xml renamed to jaxrs/sse-producer/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33

44
<parent>
55
<groupId>org.javaee8</groupId>
6-
<artifactId>sse</artifactId>
6+
<artifactId>jaxrs</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>sse-producer</artifactId>
1111
<packaging>war</packaging>
12-
<name>Java EE 8 Samples: Server Sent Events [Producer]</name>
13-
<dependencies>
14-
</dependencies>
12+
<name>Java EE 8 Samples: JAX-RS - SSE Producer</name>
1513
</project>

sse/producer/src/main/java/org/javaee8/sse/data/EventData.java renamed to jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/data/EventData.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javaee8.sse.data;
1+
package org.javaee8.jaxrs.sseproducer.data;
22

33
import java.util.Date;
44
import java.util.UUID;

sse/producer/src/main/java/org/javaee8/sse/producer/SseResource.java renamed to jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/producer/SseResource.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javaee8.sse.producer;
1+
package org.javaee8.jaxrs.sseproducer.producer;
22

33
import javax.annotation.PostConstruct;
44
import javax.json.bind.Jsonb;
@@ -11,7 +11,8 @@
1111
import javax.ws.rs.sse.Sse;
1212
import javax.ws.rs.sse.SseBroadcaster;
1313
import javax.ws.rs.sse.SseEventSink;
14-
import org.javaee8.sse.data.EventData;
14+
15+
import org.javaee8.jaxrs.sseproducer.data.EventData;
1516

1617
/**
1718
* @author Daniel Contreras

sse/producer/src/main/java/org/javaee8/sse/rest/RestApplication.java renamed to jaxrs/sse-producer/src/main/java/org/javaee8/jaxrs/sseproducer/rest/RestApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javaee8.sse.rest;
1+
package org.javaee8.jaxrs.sseproducer.rest;
22

33
import javax.ws.rs.ApplicationPath;
44
import javax.ws.rs.core.Application;

sse/producer/src/main/webapp/index.html renamed to jaxrs/sse-producer/src/main/webapp/index.html

File renamed without changes.

sse/producer/src/test/java/org/javaee8/sse/producer/SseResourceTest.java renamed to jaxrs/sse-producer/src/test/java/org/javaee8/jaxrs/sseproducer/SseResourceTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.javaee8.sse.producer;
1+
package org.javaee8.jaxrs.sseproducer;
22

33
import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
44

@@ -9,6 +9,9 @@
99
import javax.json.bind.Jsonb;
1010
import javax.json.bind.JsonbBuilder;
1111

12+
import org.javaee8.jaxrs.sseproducer.data.EventData;
13+
import org.javaee8.jaxrs.sseproducer.producer.SseResource;
14+
import org.javaee8.jaxrs.sseproducer.rest.RestApplication;
1215
import org.jboss.arquillian.container.test.api.Deployment;
1316
import org.jboss.arquillian.container.test.api.RunAsClient;
1417
import org.jboss.arquillian.junit.Arquillian;
@@ -24,8 +27,6 @@
2427
import javax.ws.rs.client.WebTarget;
2528
import javax.ws.rs.sse.SseEventSource;
2629
import static org.hamcrest.CoreMatchers.instanceOf;
27-
import org.javaee8.sse.data.EventData;
28-
import org.javaee8.sse.rest.RestApplication;
2930
import static org.junit.Assert.assertNotNull;
3031
import static org.junit.Assert.assertThat;
3132
import static org.junit.Assert.assertTrue;

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<modules>
102102
<module>test-utils</module>
103103
<module>servlet</module>
104-
<module>sse</module>
104+
<module>jaxrs</module>
105105
<module>security</module>
106106
<module>jsf</module>
107107
<module>cdi</module>

‎sse/README.md‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)