merge of user guide changes from master to 3.x
diff --git a/docs/pom.xml b/docs/pom.xml index b85f5e3..8210134 100644 --- a/docs/pom.xml +++ b/docs/pom.xml
@@ -45,7 +45,7 @@ <executions> <execution> <configuration> - <tasks> + <target> <echo message="Preparing char entities" /> <mkdir dir="${src.dir}" /> <copy todir="${src.dir}"> @@ -63,7 +63,7 @@ <replace file="${src.dir}/jersey.ent" token="$repository" value="${javanet.repository.id}" /> <replace file="${src.dir}/jersey.ent" token="$src.branch" value="${jersey.src.branch}" /> <replace file="${src.dir}/jersey.ent" token="$version" value="${jersey.version}" /> - </tasks> + </target> </configuration> <id>process-entities</id> <phase>package</phase>
diff --git a/docs/src/main/docbook/appendix-properties.xml b/docs/src/main/docbook/appendix-properties.xml index 8591dac..17e5a24 100644 --- a/docs/src/main/docbook/appendix-properties.xml +++ b/docs/src/main/docbook/appendix-properties.xml
@@ -1053,4 +1053,4 @@ </tgroup> </table> </section> -</appendix> +</appendix> \ No newline at end of file
diff --git a/docs/src/main/docbook/async.xml b/docs/src/main/docbook/async.xml index 4506829..f496bab 100644 --- a/docs/src/main/docbook/async.xml +++ b/docs/src/main/docbook/async.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2021 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
diff --git a/docs/src/main/docbook/bean-validation.xml b/docs/src/main/docbook/bean-validation.xml index 2b598a6..ad01062 100644 --- a/docs/src/main/docbook/bean-validation.xml +++ b/docs/src/main/docbook/bean-validation.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2021 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
diff --git a/docs/src/main/docbook/declarative-linking.xml b/docs/src/main/docbook/declarative-linking.xml index d9898e7..07133a8 100644 --- a/docs/src/main/docbook/declarative-linking.xml +++ b/docs/src/main/docbook/declarative-linking.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2021 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
diff --git a/docs/src/main/docbook/deployment.xml b/docs/src/main/docbook/deployment.xml index ba1807b..474fd63 100644 --- a/docs/src/main/docbook/deployment.xml +++ b/docs/src/main/docbook/deployment.xml
@@ -1118,6 +1118,19 @@ For now Oracle WebLogic Server does not support Jakartified Jersey 3.x deployment (for deployment of prior versions of Jersey please refer to corresponding manual/user guide) </para> + <para> + In 10.3.x, a set of pre-built shared libraries were delivered with WebLogic Server to support + Jersey 1.9 and 1.1.5.1 Java API for RESTful Web Services (JAX-RS) Reference Implementations (RIs). + In 12.2.x, WebLogic Server supports Jersey 2.21.x (JAX-RS 2.0 RI) by default. To use the pre-built + shared libraries of 10.3.x, you needed to register them with the WebLogic Server instance, and + modify the web.xml and weblogic.xml deployment descriptors to use the Jersey servlet and reference + the shared libraries, respectively. + In 12.2.x, as WebLogic Server supports Jersey 2.21.x (JAX-RS 2.0 RI) by default, registration as a + shared library with WebLogic Server is no longer required. + Please read through + the <link xlink:href="https://docs.oracle.com/middleware/12213/wls/WLUPG/upgrade_ws.htm#WLUPG331"> + Upgrading a 10.3.x RESTful Web Service (JAX-RS) to 12.2.x</link> + </para> </section> <section xml:id="deployment.appservers.other">
diff --git a/docs/src/main/docbook/filters.xml b/docs/src/main/docbook/filters.xml index c3eb131..e841aaa 100644 --- a/docs/src/main/docbook/filters.xml +++ b/docs/src/main/docbook/filters.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2021 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
diff --git a/docs/src/main/docbook/getting-started.xml b/docs/src/main/docbook/getting-started.xml index e46f246..41eba64 100644 --- a/docs/src/main/docbook/getting-started.xml +++ b/docs/src/main/docbook/getting-started.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2021 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 @@ -53,7 +53,7 @@ <programlisting language="xml" linenumbering="unnumbered"><snapshotRepository> <id>ossrh</id> <name>Sonatype Nexus Snapshots</name> - <url>https://oss.sonatype.org/content/repositories/snapshots/</url> + <url>https://jakarta.oss.sonatype.org/content/repositories/snapshots/</url> </snapshotRepository></programlisting> </para> </note> @@ -267,24 +267,22 @@ a lot of additional information about the whole communication: <screen language="bash" linenumbering="unnumbered"><![CDATA[$ curl -v http://localhost:8080/myapp/myresource -* About to connect() to localhost port 8080 (#0) -* Trying ::1... -* Connection refused -* Trying 127.0.0.1... -* connected +* Trying 127.0.0.1:8080... +* TCP_NODELAY set * Connected to localhost (127.0.0.1) port 8080 (#0) > GET /myapp/myresource HTTP/1.1 -> User-Agent: curl/7.25.0 (x86_64-apple-darwin11.3.0) libcurl/7.25.0 OpenSSL/1.0.1e zlib/1.2.7 libidn/1.22 > Host: localhost:8080 +> User-Agent: curl/7.68.0 > Accept: */* > +* Mark bundle as not supporting multiuse < HTTP/1.1 200 OK < Content-Type: text/plain < Date: Sun, 26 May 2020 18:29:18 GMT < Content-Length: 7 < * Connection #0 to host localhost left intact -Got it!* Closing connection #0]]></screen> +Got it!]]></screen> </para> </section> @@ -541,8 +539,8 @@ Total 21 (delta 0), reused 0 (delta 0) -----> Java app detected - -----> Installing OpenJDK 1.7... done - -----> Installing Maven 3.0.3... done + -----> Installing OpenJDK 1.8... done + -----> Installing Maven 3.6.3... done -----> Installing settings.xml... done -----> executing /app/tmp/cache/.maven/bin/mvn -B -Duser.home=/tmp/build_992cc747-26d6-4800-bdb1-add47b9583cd -Dmaven.repo.local=/app/tmp/cache/.m2/repository -s /app/tmp/cache/.m2/settings.xml -DskipTests=true clean install [INFO] Scanning for projects...
diff --git a/docs/src/main/docbook/jaxrs-resources.xml b/docs/src/main/docbook/jaxrs-resources.xml index 6c88f1b..d6cb100 100644 --- a/docs/src/main/docbook/jaxrs-resources.xml +++ b/docs/src/main/docbook/jaxrs-resources.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2021 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
diff --git a/docs/src/main/docbook/jersey.ent b/docs/src/main/docbook/jersey.ent index 2ee4675..f9f065b 100644 --- a/docs/src/main/docbook/jersey.ent +++ b/docs/src/main/docbook/jersey.ent
@@ -61,6 +61,7 @@ <!ENTITY jaxrs.javadoc.uri "https://eclipse-ee4j.github.io/jaxrs-api/apidocs/&jax-rs.version;/jakarta/ws/rs"> <!ENTITY jaxrs21.javadoc.uri "https://eclipse-ee4j.github.io/jaxrs-api/apidocs/&jax-rs21.version;/javax/ws/rs"> <!ENTITY jsonb.javadoc.uri "https://javaee.github.io/javaee-spec/javadocs/javax/json/bind"> +<!ENTITY jersey.documentation.uri "https://eclipse-ee4j.github.io/jersey.github.io"> <!ENTITY jersey.ext.bean-validation.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-bean-validation/dependencies.html'>jersey-bean-validation</link>" > <!ENTITY jersey.ext.declarative-linking.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-declarative-linking/dependencies.html'>jersey-declarative-linking</link>" > @@ -81,12 +82,12 @@ <!ENTITY jersey.ext.mvc-jsp.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-mvc-jsp/dependencies.html'>jersey-mvc-jsp</link>" > <!ENTITY jersey.ext.mvc-mustache.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-mvc-mustache/dependencies.html'>jersey-mvc-mustache</link>" > <!ENTITY jersey.ext.spring4.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-spring4/dependencies.html'>jersey-spring4</link>" > -<!ENTITY jersey.docs.root.uri "https://eclipse-ee4j.github.io/jersey.github.io/documentation/&docs.version;"> +<!ENTITY jersey.docs.root.uri "&jersey.documentation.uri;/documentation/&docs.version;"> <!ENTITY jersey.docs.index.uri "&jersey.docs.root.uri;/index.html"> <!ENTITY jersey.github.examples.uri "&jersey.github.release.uri;/examples"> <!ENTITY jersey.github.base.uri "https://github.com/eclipse-ee4j/jersey/tree"> <!ENTITY jersey.github.release.uri "&jersey.github.base.uri;/&src.branch;"> -<!ENTITY jersey.javadoc.root.uri "https://eclipse-ee4j.github.io/jersey.github.io/apidocs/&apidocs.version;/jersey"> +<!ENTITY jersey.javadoc.root.uri "&jersey.documentation.uri;/apidocs/&apidocs.version;/jersey"> <!ENTITY jersey.javadoc.uri.prefix "&jersey.javadoc.root.uri;/org/glassfish/jersey"> <!ENTITY jersey.project-info.uri.prefix "https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project"> <!ENTITY jee.javadoc.uri "https://jakarta.ee/specifications/">
diff --git a/docs/src/main/docbook/mbw.xml b/docs/src/main/docbook/mbw.xml index 33379cc..09b997c 100644 --- a/docs/src/main/docbook/mbw.xml +++ b/docs/src/main/docbook/mbw.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2021 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
diff --git a/docs/src/main/docbook/media.xml b/docs/src/main/docbook/media.xml index dca190e..95581df 100644 --- a/docs/src/main/docbook/media.xml +++ b/docs/src/main/docbook/media.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2021 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
diff --git a/docs/src/main/docbook/migration.xml b/docs/src/main/docbook/migration.xml index 13b6bef..3dc710e 100644 --- a/docs/src/main/docbook/migration.xml +++ b/docs/src/main/docbook/migration.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2021 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
diff --git a/docs/src/main/docbook/monitoring.xml b/docs/src/main/docbook/monitoring.xml index 398ae28..8583355 100644 --- a/docs/src/main/docbook/monitoring.xml +++ b/docs/src/main/docbook/monitoring.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2021 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
diff --git a/docs/src/main/docbook/mp-config.xml b/docs/src/main/docbook/mp-config.xml index 7f79bc4..c2ff5c8 100644 --- a/docs/src/main/docbook/mp-config.xml +++ b/docs/src/main/docbook/mp-config.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2020, 2021 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
diff --git a/docs/src/main/docbook/mvc.xml b/docs/src/main/docbook/mvc.xml index e6a811a..f4bf93f 100644 --- a/docs/src/main/docbook/mvc.xml +++ b/docs/src/main/docbook/mvc.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2013, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2021 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
diff --git a/docs/src/main/docbook/representations.xml b/docs/src/main/docbook/representations.xml index 9783bc1..50515d6 100644 --- a/docs/src/main/docbook/representations.xml +++ b/docs/src/main/docbook/representations.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2010, 2021 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
diff --git a/docs/src/main/docbook/wadl.xml b/docs/src/main/docbook/wadl.xml index 853a662..7f06c59 100644 --- a/docs/src/main/docbook/wadl.xml +++ b/docs/src/main/docbook/wadl.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2012, 2021 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