Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DocBook fixes #4273

Merged
merged 2 commits into from
Sep 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions docs/src/main/docbook/customizations.xsl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--

Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 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
Expand Down Expand Up @@ -29,9 +29,9 @@
<xsl:element name="div">
<xsl:attribute name="style">float:right</xsl:attribute>
<xsl:element name="a">
<xsl:attribute name="href">https://jersey.github.io</xsl:attribute>
<xsl:attribute name="href">https://eclipse-ee4j.github.io/jersey</xsl:attribute>
<xsl:element name="img">
<xsl:attribute name="src">https://jersey.github.io/images/jersey_logo.png</xsl:attribute>
<xsl:attribute name="src">https://eclipse-ee4j.github.io/jersey.github.io/images/jersey_logo.png</xsl:attribute>
</xsl:element>
</xsl:element>
</xsl:element>
Expand All @@ -48,21 +48,21 @@

<xsl:template name="user.footer.content">
<xsl:element name="link">
<xsl:attribute name="href">https://jersey.github.io/sh/shCore.css</xsl:attribute>
<xsl:attribute name="href">https://eclipse-ee4j.github.io/jersey.github.io/sh/shCore.css</xsl:attribute>
<xsl:attribute name="rel">stylesheet</xsl:attribute>
<xsl:attribute name="type">text/css</xsl:attribute>
</xsl:element>
<xsl:element name="link">
<xsl:attribute name="href">https://jersey.github.io/sh/shThemeDefault.css</xsl:attribute>
<xsl:attribute name="href">https://eclipse-ee4j.github.io/jersey.github.io/sh/shThemeDefault.css</xsl:attribute>
<xsl:attribute name="rel">stylesheet</xsl:attribute>
<xsl:attribute name="type">text/css</xsl:attribute>
</xsl:element>
<xsl:element name="script">
<xsl:attribute name="src">https://jersey.github.io/sh/shCore.js</xsl:attribute>
<xsl:attribute name="src">https://eclipse-ee4j.github.io/jersey.github.io/sh/shCore.js</xsl:attribute>
<xsl:attribute name="type">text/javascript</xsl:attribute>
</xsl:element>
<xsl:element name="script">
<xsl:attribute name="src">https://jersey.github.io/sh/shAutoloader.js</xsl:attribute>
<xsl:attribute name="src">https://eclipse-ee4j.github.io/jersey.github.io/sh/shAutoloader.js</xsl:attribute>
<xsl:attribute name="type">text/javascript</xsl:attribute>
</xsl:element>
<xsl:element name="script">
Expand All @@ -73,7 +73,7 @@
;

for(var i = 0; i &lt; args.length; i++)
result.push(args[i].replace('@', 'https://jersey.github.io/sh/'));
result.push(args[i].replace('@', 'https://eclipse-ee4j.github.io/jersey.github.io/sh/'));

return result
};
Expand Down
12 changes: 8 additions & 4 deletions docs/src/main/docbook/dependencies.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 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
Expand Down Expand Up @@ -49,6 +49,10 @@
<para>Since Jersey 2.26, all modules are build using Java SE 8 and there is no support for running it
on older Java SE distributions.</para>
</listitem>
<listitem>
<para>Since Jersey 2.29, all modules can be built using Java SE 11 and all distributed modules provide support
for Java SE 8+ (9,11).</para>
</listitem>
</itemizedlist>
</para>
</section>
Expand All @@ -59,10 +63,10 @@
Jersey is built, assembled and installed using <link xlink:href="http://maven.apache.org/">Apache Maven</link>.
Non-snapshot Jersey releases are deployed to the
<link xlink:href="http://search.maven.org/">Central Maven Repository</link>. Jersey is also being deployed to
<link xlink:href="http://maven.java.net/">Java.Net Maven repositories</link>, which contain also Jersey SNAPSHOT
<link xlink:href="https://oss.sonatype.org/">Sonatype Maven repositories</link>, which contain also Jersey SNAPSHOT
versions. In case you would want to test the latest development builds check out the
<link xlink:href="https://maven.java.net/content/repositories/snapshots/org/glassfish/jersey">
Java.Net Snapshots Maven repository</link>.
<link xlink:href="https://oss.sonatype.org/content/repositories/snapshots/org/glassfish/jersey">
Sonatype Snapshots Maven repository</link>.
</para>

<para>
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/docbook/deployment.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--

Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2013, 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
Expand Down Expand Up @@ -1316,7 +1316,7 @@ Bundle ID: 303</programlisting>
or install it directly from the maven repository:

<programlisting language="bash shell" linenumbering="numbered">
gogo$ install http://maven.java.net/content/repositories/releases/org/glassfish/jersey/examples/osgi-http-service/bundle/&lt;version&gt;/bundle-&lt;version&gt;.jar
gogo$ install http://central.maven.org/maven2/org/glassfish/jersey/examples/osgi-http-service/bundle/&lt;version&gt;/bundle-&lt;version&gt;.jar
Bundle ID: 303</programlisting>
</para>

Expand Down
15 changes: 7 additions & 8 deletions docs/src/main/docbook/getting-started.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--

Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 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
Expand Down Expand Up @@ -50,12 +50,11 @@
In case you want to depend on the latest SNAPSHOT versions of Jersey modules, the following repository
configuration needs to be added to your Maven project pom:

<programlisting language="xml" linenumbering="unnumbered">&lt;repository&gt;
&lt;id&gt;snapshot-repository.java.net&lt;/id&gt;
&lt;name&gt;Java.net Snapshot Repository for Maven&lt;/name&gt;
&lt;url&gt;https://maven.java.net/content/repositories/snapshots/&lt;/url&gt;
&lt;layout&gt;default&lt;/layout&gt;
&lt;/repository&gt;</programlisting>
<programlisting language="xml" linenumbering="unnumbered">&lt;snapshotRepository&gt;
&lt;id&gt;ossrh&lt;/id&gt;
&lt;name&gt;Sonatype Nexus Snapshots&lt;/name&gt;
&lt;url&gt;https://oss.sonatype.org/content/repositories/snapshots/&lt;/url&gt;
&lt;/snapshotRepository&gt;</programlisting>
</para>
</note>
</para>
Expand Down Expand Up @@ -646,7 +645,7 @@ Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
Feel free to browse through the code of individual
<link xlink:href="&jersey.github.examples.uri;">Jersey Examples</link> in the Jersey source repository.
For off-line browsing, you can also download a bundle with all the examples from
<link xlink:href="https://maven.java.net/content/repositories/&repository;/org/glassfish/jersey/bundles/jersey-examples/&version;/">here</link>.
<link xlink:href="http://central.maven.org/maven2/org/glassfish/jersey/bundles/jersey-examples/&version;/">here</link>.
</para>
</section>
</chapter>
8 changes: 4 additions & 4 deletions docs/src/main/docbook/how-to-build.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--

Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 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
Expand Down Expand Up @@ -33,7 +33,7 @@
<title>Checking Out the Source</title>
<para>
Jersey source code is available on GitHub. You can browse the sources at
<link xlink:href="https://github.com/jersey/jersey">https://github.com/jersey/jersey</link>.
<link xlink:href="https://github.com/eclipse-ee4j/jersey">https://github.com/eclipse-ee4j/jersey</link>.
</para>
<para>
In case you are not familiar with Git, we recommend reading some of the many "Getting Started with Git" articles
Expand All @@ -50,14 +50,14 @@
<para>
To clone the Jersey repository you can execute the following command on the command-line
(provided you have a command-line Git client installed on your machine):
<programlisting language="bash" linenumbering="unnumbered">git clone git://github.com/jersey/jersey.git</programlisting>
<programlisting language="bash" linenumbering="unnumbered">git clone git://github.com/eclipse-ee4j/jersey.git</programlisting>
This creates read-only copy of Jersey workspace. If you want to contribute, please use "pull request":
<link xlink:href="https://help.github.com/articles/creating-a-pull-request">https://help.github.com/articles/creating-a-pull-request</link>.
</para>
<para>
Milestones and releases of Jersey are tagged. You can list the tags by executing the standard Git command in the repository directory:
<programlisting language="bash" linenumbering="unnumbered">git tag -l</programlisting> or by visiting
<link xlink:href="https://github.com/jersey/jersey/tags">https://github.com/jersey/jersey/tags</link>.
<link xlink:href="https://github.com/eclipse-ee4j/jersey/tags">https://github.com/eclipse-ee4j/jersey/tags</link>.
</para>
</section>

Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/docbook/jaxrs-resources.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--

Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 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
Expand Down Expand Up @@ -53,7 +53,7 @@
resource class using JAX-RS annotations. The example code shown here is
from one of the samples that ships with Jersey, the zip file of which can
be found in the maven repository
<link xlink:href="https://maven.java.net/content/repositories/&repository;/org/glassfish/jersey/examples/helloworld/&version;/">here</link>.
<link xlink:href="http://central.maven.org/maven2/org/glassfish/jersey/examples/helloworld//&version;/">here</link>.
</para>
<para>
<example>
Expand Down
34 changes: 17 additions & 17 deletions docs/src/main/docbook/jersey.ent
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<!--

Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2010, 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
Expand Down Expand Up @@ -33,7 +33,7 @@
<!ENTITY jackson.javadoc.version "$jackson-version">
<!-- temporary hardcoded javadoc version - the correct one is missing at the provider's web -->
<!ENTITY jackson.javadoc.temp.version "2.3.0">
<!ENTITY repository "$repository">
<!--<!ENTITY repository "$repository">-->
<!ENTITY src.branch "$src.branch">
<!ENTITY version "$version">

Expand All @@ -42,19 +42,19 @@
<!ENTITY bv.project.link "<link xlink:href='http://beanvalidation.org/'>Bean Validation</link>">
<!ENTITY bv11.javadoc.uri "http://docs.jboss.org/hibernate/beanvalidation/spec/1.1/api">
<!ENTITY cloud.guide "<link xlink:href='http://docs.oracle.com/cloud/131/developer_services/CSJSU/java-develop.htm#BABHDAJH'>guide</link>">
<!ENTITY felix.link "<link xlink:href='http://felix.apache.org/site/index.html'>Apache Felix</link>">
<!ENTITY grizzly.link "<link xlink:href='http://grizzly.java.net/'>Grizzly</link>">
<!ENTITY guava.javadoc.uri "http://docs.guava-libraries.googlecode.com/git-history/v&guava.version;/javadoc/">
<!ENTITY guava.link "<link xlink:href='https://code.google.com/p/guava-libraries/'>Guava</link>">
<!ENTITY felix.link "<link xlink:href='https://felix.apache.org/'>Apache Felix</link>">
<!ENTITY grizzly.link "<link xlink:href='https://javaee.github.io/grizzly/'>Grizzly</link>">
<!ENTITY guava.javadoc.uri "https://guava.dev/releases/&guava.version;/api/docs/">
<!ENTITY guava.link "<link xlink:href='https://guava.dev/'>Guava</link>">
<!ENTITY heroku.uri "https://www.heroku.com">
<!ENTITY heroku.link "<link xlink:href='&heroku.uri;'>Heroku</link>">
<!ENTITY hk2.javadoc.uri "https://hk2.java.net/apidocs">
<!ENTITY hk2.link "<link xlink:href='http://hk2.java.net/'>HK2</link>">
<!ENTITY hk2.spring-bridge.link "<link xlink:href='https://hk2.java.net/spring-bridge/'>The Spring/HK2 Bridge</link>">
<!ENTITY jaxb.release.uri "http://jaxb.java.net/nonav/&jaxb-api-jar.version;">
<!ENTITY hk2.javadoc.uri "https://javaee.github.io/hk2/apidocs/">
<!ENTITY hk2.link "<link xlink:href='https://javaee.github.io/hk2/'>HK2</link>">
<!ENTITY hk2.spring-bridge.link "<link xlink:href='https://javaee.github.io/hk2/spring-bridge/'>The Spring/HK2 Bridge</link>">
<!ENTITY jaxb.release.uri "https://eclipse-ee4j.github.io/jaxb-ri">
<!ENTITY jaxb.javadoc.uri "&jaxb.release.uri;/docs/api/javax/xml/bind">
<!ENTITY jaxrs.release.uri "http://jax-rs-spec.java.net/nonav/&jax-rs.version;">
<!ENTITY jaxrs.javadoc.uri "https://jersey.github.io/apidocs-javax.jax-rs/&jax-rs.version;/javax/ws/rs">
<!ENTITY jaxrs.release.uri "https://github.com/jax-rs">
<!ENTITY jaxrs.javadoc.uri "https://jax-rs.github.io/apidocs/&jax-rs.version;/">
<!ENTITY jaxrs21.javadoc.uri "#/javax/ws/rs"> <!-- TODO - once we have published javadocs to link here -->

<!ENTITY jersey.ext.bean-validation.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-bean-validation/dependencies.html'>jersey-bean-validation</link>" >
Expand All @@ -75,14 +75,14 @@
<!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://jersey.github.io/documentation/&docs.version;">
<!ENTITY jersey.docs.root.uri "https://eclipse-ee4j.github.io/jersey.github.io/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/jersey/jersey/tree">
<!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://jersey.github.io/apidocs/&apidocs.version;/jersey">
<!ENTITY jersey.javadoc.root.uri "https://eclipse-ee4j.github.io/jersey.github.io/apidocs/&apidocs.version;/jersey">
<!ENTITY jersey.javadoc.uri.prefix "&jersey.javadoc.root.uri;/org/glassfish/jersey">
<!ENTITY jersey.project-info.uri.prefix "https://jersey.github.io/project-info/&version;/jersey/project">
<!ENTITY jersey.project-info.uri.prefix "https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project">
<!ENTITY jee.javadoc.uri "http://docs.oracle.com/javaee/7/api">
<!ENTITY jdk6.javadoc.uri "http://docs.oracle.com/javase/6/docs/api">
<!ENTITY jdk7.javadoc.uri "http://docs.oracle.com/javase/7/docs/api">
Expand All @@ -99,7 +99,7 @@
<!ENTITY rxjava.link "<link xlink:href='&rxjava.uri;'>RxJava</link>">
<!ENTITY rxjava.uri "https://github.com/ReactiveX/RxJava">
<!ENTITY wikipedia.uri "http://en.wikipedia.org/wiki/">
<!ENTITY jira.uri.prefix "https://java.net/jira/browse">
<!ENTITY jira.uri.prefix "https://github.com/eclipse-ee4j/jersey/issues">

<!-- API Docs links -->
<!ENTITY bv.Configuration "<link xlink:href='&bv11.javadoc.uri;/javax/validation/Configuration.html'>Configuration</link>">
Expand Down
Loading