JAX-RS renamed to Jakarta RESTful Web Services (#185)
diff --git a/bundles/ri/src/main/resources/README.txt b/bundles/ri/src/main/resources/README.txt index 4f26662..123dfa7 100644 --- a/bundles/ri/src/main/resources/README.txt +++ b/bundles/ri/src/main/resources/README.txt
@@ -6,7 +6,7 @@ * mods/jakarta.json-api-${project.version}.jar - 'java.json' module containing only API classes * mods/jakarta.json-${project.version}-module.jar - 'org.glassfish.java.json' module containing implementation -Integration with JAX-RS: Java API for RESTful Web Services (JAX-RS) is provided through +Integration with Jakarta RESTful Web Services: Jakarta RESTful Web Services is provided through * jaxrs/jsonp-jaxrs-${project.version}.jar @@ -37,7 +37,7 @@ <version>${project.version}</version> </dependency> -for JAX-RS integration module: +for Jakarta RESTful Web Services integration module: <dependency> <groupId>org.glassfish</groupId> <artifactId>jsonp-jaxrs</artifactId> @@ -45,7 +45,7 @@ </dependency> -* GlassFish 5.x already bundles latest JSON Processing implementation and JAX-RS integration module. +* GlassFish 5.x already bundles latest Jakarta JSON Processing implementation and Jakarta RESTful Web Services integration module. If you deploy an application with GlassFish 5.x, your application (war/ear) doesn't have to bundle APIs nor the ri jar. * Samples can be run from https://github.com/javaee/glassfish-samples
diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java index 0a7ff5d..30b057d 100644 --- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java +++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ArrayResource.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 @@ -15,7 +15,7 @@ import javax.ws.rs.core.MediaType; /** - * JsonArray as parameter and return type for a JAX-RS resource + * JsonArray as parameter and return type for a Jakarta RESTful Web Services resource * * @author Jitendra Kotamraju */
diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java index af7b5ba..0446382 100644 --- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java +++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/DemoApplication.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 @@ -19,7 +19,7 @@ import java.util.Set; /** - * A JAX-RS Demo Application using JSON API + * A Jakarta RESTful Web Services Demo Application * * @author Jitendra Kotamraju */
diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java index 3a4e042..d79d2ba 100644 --- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java +++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/ObjectResource.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 @@ -15,7 +15,8 @@ import javax.ws.rs.core.MediaType; /** - * JsonObject as parameter and return type for a JAX-RS resource + * JsonObject as parameter and return type for a + * Jakarta RESTful Web Services resource * Writes a person's representation as JSON using JsonObject * * @author Jitendra Kotamraju
diff --git a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java index 1c8e786..2194d70 100644 --- a/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java +++ b/demos/jaxrs/src/main/java/org/glassfish/jsondemos/jaxrs/StructureResource.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 @@ -15,7 +15,8 @@ import javax.ws.rs.core.MediaType; /** - * JsonStructure as parameter and return type for a JAX-RS resource + * JsonStructure as parameter and return type for a + * Jakarta RESTful Web Services resource * * @author Jitendra Kotamraju */
diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml index 53c1ac7..7774011 100644 --- a/jaxrs/pom.xml +++ b/jaxrs/pom.xml
@@ -31,8 +31,8 @@ <artifactId>jsonp-jaxrs</artifactId> <packaging>bundle</packaging> <version>1.1.6-SNAPSHOT</version> - <name>Jakarta JSON Processing Media for JAX-RS</name> - <description>JAX-RS MessageBodyReader and MessageBodyWriter to support JsonValue API of Jakarta JSON Processing</description> + <name>Jakarta JSON Processing Media for Jakarta RESTful Web Services</name> + <description>Jakarta RESTful Web Services MessageBodyReader and MessageBodyWriter to support JsonValue API of Jakarta JSON Processing</description> <url>https://github.com/eclipse-ee4j/jsonp</url> <build> <plugins>
diff --git a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java index e04f792..11562b0 100644 --- a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java +++ b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyReader.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -32,8 +32,8 @@ import javax.ws.rs.ext.Provider; /** - * JAX-RS MessageBodyReader for JsonValue. This allows JsonValue - * to be a parameter of a resource method. + * Jakarta RESTful Web Services MessageBodyReader for JsonValue. + * This allows JsonValue to be a parameter of a resource method. * * @author Jitendra Kotamraju * @author Blaise Doughan
diff --git a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java index 218ab2e..0cd0fd4 100644 --- a/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java +++ b/jaxrs/src/main/java/org/glassfish/json/jaxrs/JsonValueBodyWriter.java
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v. 2.0, which is available at @@ -38,8 +38,8 @@ import javax.ws.rs.ext.Provider; /** - * JAX-RS MessageBodyWriter for JsonValue. This allows JsonValue - * to be return type of a resource method. + * Jakarta RESTful Web Services MessageBodyWriter for JsonValue. + * This allows JsonValue to be return type of a resource method. * * @author Jitendra Kotamraju * @author Blaise Doughan