Skip to content

Commit da6d3e1

Browse files
senivamsenivam
authoredSep 30, 2019
DocBook fixes (#4273)
* DocBook fixes Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
1 parent 092c17e commit da6d3e1

12 files changed

+215
-217
lines changed
 

‎docs/src/main/docbook/customizations.xsl

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
4-
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -29,9 +29,9 @@
2929
<xsl:element name="div">
3030
<xsl:attribute name="style">float:right</xsl:attribute>
3131
<xsl:element name="a">
32-
<xsl:attribute name="href">https://jersey.github.io</xsl:attribute>
32+
<xsl:attribute name="href">https://eclipse-ee4j.github.io/jersey</xsl:attribute>
3333
<xsl:element name="img">
34-
<xsl:attribute name="src">https://jersey.github.io/images/jersey_logo.png</xsl:attribute>
34+
<xsl:attribute name="src">https://eclipse-ee4j.github.io/jersey.github.io/images/jersey_logo.png</xsl:attribute>
3535
</xsl:element>
3636
</xsl:element>
3737
</xsl:element>
@@ -48,21 +48,21 @@
4848

4949
<xsl:template name="user.footer.content">
5050
<xsl:element name="link">
51-
<xsl:attribute name="href">https://jersey.github.io/sh/shCore.css</xsl:attribute>
51+
<xsl:attribute name="href">https://eclipse-ee4j.github.io/jersey.github.io/sh/shCore.css</xsl:attribute>
5252
<xsl:attribute name="rel">stylesheet</xsl:attribute>
5353
<xsl:attribute name="type">text/css</xsl:attribute>
5454
</xsl:element>
5555
<xsl:element name="link">
56-
<xsl:attribute name="href">https://jersey.github.io/sh/shThemeDefault.css</xsl:attribute>
56+
<xsl:attribute name="href">https://eclipse-ee4j.github.io/jersey.github.io/sh/shThemeDefault.css</xsl:attribute>
5757
<xsl:attribute name="rel">stylesheet</xsl:attribute>
5858
<xsl:attribute name="type">text/css</xsl:attribute>
5959
</xsl:element>
6060
<xsl:element name="script">
61-
<xsl:attribute name="src">https://jersey.github.io/sh/shCore.js</xsl:attribute>
61+
<xsl:attribute name="src">https://eclipse-ee4j.github.io/jersey.github.io/sh/shCore.js</xsl:attribute>
6262
<xsl:attribute name="type">text/javascript</xsl:attribute>
6363
</xsl:element>
6464
<xsl:element name="script">
65-
<xsl:attribute name="src">https://jersey.github.io/sh/shAutoloader.js</xsl:attribute>
65+
<xsl:attribute name="src">https://eclipse-ee4j.github.io/jersey.github.io/sh/shAutoloader.js</xsl:attribute>
6666
<xsl:attribute name="type">text/javascript</xsl:attribute>
6767
</xsl:element>
6868
<xsl:element name="script">
@@ -73,7 +73,7 @@
7373
;
7474

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

7878
return result
7979
};

‎docs/src/main/docbook/dependencies.xml

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -49,6 +49,10 @@
4949
<para>Since Jersey 2.26, all modules are build using Java SE 8 and there is no support for running it
5050
on older Java SE distributions.</para>
5151
</listitem>
52+
<listitem>
53+
<para>Since Jersey 2.29, all modules can be built using Java SE 11 and all distributed modules provide support
54+
for Java SE 8+ (9,11).</para>
55+
</listitem>
5256
</itemizedlist>
5357
</para>
5458
</section>
@@ -59,10 +63,10 @@
5963
Jersey is built, assembled and installed using <link xlink:href="http://maven.apache.org/">Apache Maven</link>.
6064
Non-snapshot Jersey releases are deployed to the
6165
<link xlink:href="http://search.maven.org/">Central Maven Repository</link>. Jersey is also being deployed to
62-
<link xlink:href="http://maven.java.net/">Java.Net Maven repositories</link>, which contain also Jersey SNAPSHOT
66+
<link xlink:href="https://oss.sonatype.org/">Sonatype Maven repositories</link>, which contain also Jersey SNAPSHOT
6367
versions. In case you would want to test the latest development builds check out the
64-
<link xlink:href="https://maven.java.net/content/repositories/snapshots/org/glassfish/jersey">
65-
Java.Net Snapshots Maven repository</link>.
68+
<link xlink:href="https://oss.sonatype.org/content/repositories/snapshots/org/glassfish/jersey">
69+
Sonatype Snapshots Maven repository</link>.
6670
</para>
6771

6872
<para>

‎docs/src/main/docbook/deployment.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright (c) 2013, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2013, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -1316,7 +1316,7 @@ Bundle ID: 303</programlisting>
13161316
or install it directly from the maven repository:
13171317

13181318
<programlisting language="bash shell" linenumbering="numbered">
1319-
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
1319+
gogo$ install http://central.maven.org/maven2/org/glassfish/jersey/examples/osgi-http-service/bundle/&lt;version&gt;/bundle-&lt;version&gt;.jar
13201320
Bundle ID: 303</programlisting>
13211321
</para>
13221322

‎docs/src/main/docbook/getting-started.xml

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -50,12 +50,11 @@
5050
In case you want to depend on the latest SNAPSHOT versions of Jersey modules, the following repository
5151
configuration needs to be added to your Maven project pom:
5252

53-
<programlisting language="xml" linenumbering="unnumbered">&lt;repository&gt;
54-
&lt;id&gt;snapshot-repository.java.net&lt;/id&gt;
55-
&lt;name&gt;Java.net Snapshot Repository for Maven&lt;/name&gt;
56-
&lt;url&gt;https://maven.java.net/content/repositories/snapshots/&lt;/url&gt;
57-
&lt;layout&gt;default&lt;/layout&gt;
58-
&lt;/repository&gt;</programlisting>
53+
<programlisting language="xml" linenumbering="unnumbered">&lt;snapshotRepository&gt;
54+
&lt;id&gt;ossrh&lt;/id&gt;
55+
&lt;name&gt;Sonatype Nexus Snapshots&lt;/name&gt;
56+
&lt;url&gt;https://oss.sonatype.org/content/repositories/snapshots/&lt;/url&gt;
57+
&lt;/snapshotRepository&gt;</programlisting>
5958
</para>
6059
</note>
6160
</para>
@@ -646,7 +645,7 @@ Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
646645
Feel free to browse through the code of individual
647646
<link xlink:href="&jersey.github.examples.uri;">Jersey Examples</link> in the Jersey source repository.
648647
For off-line browsing, you can also download a bundle with all the examples from
649-
<link xlink:href="https://maven.java.net/content/repositories/&repository;/org/glassfish/jersey/bundles/jersey-examples/&version;/">here</link>.
648+
<link xlink:href="http://central.maven.org/maven2/org/glassfish/jersey/bundles/jersey-examples/&version;/">here</link>.
650649
</para>
651650
</section>
652651
</chapter>

‎docs/src/main/docbook/how-to-build.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,7 +33,7 @@
3333
<title>Checking Out the Source</title>
3434
<para>
3535
Jersey source code is available on GitHub. You can browse the sources at
36-
<link xlink:href="https://github.com/jersey/jersey">https://github.com/jersey/jersey</link>.
36+
<link xlink:href="https://github.com/eclipse-ee4j/jersey">https://github.com/eclipse-ee4j/jersey</link>.
3737
</para>
3838
<para>
3939
In case you are not familiar with Git, we recommend reading some of the many "Getting Started with Git" articles
@@ -50,14 +50,14 @@
5050
<para>
5151
To clone the Jersey repository you can execute the following command on the command-line
5252
(provided you have a command-line Git client installed on your machine):
53-
<programlisting language="bash" linenumbering="unnumbered">git clone git://github.com/jersey/jersey.git</programlisting>
53+
<programlisting language="bash" linenumbering="unnumbered">git clone git://github.com/eclipse-ee4j/jersey.git</programlisting>
5454
This creates read-only copy of Jersey workspace. If you want to contribute, please use "pull request":
5555
<link xlink:href="https://help.github.com/articles/creating-a-pull-request">https://help.github.com/articles/creating-a-pull-request</link>.
5656
</para>
5757
<para>
5858
Milestones and releases of Jersey are tagged. You can list the tags by executing the standard Git command in the repository directory:
5959
<programlisting language="bash" linenumbering="unnumbered">git tag -l</programlisting> or by visiting
60-
<link xlink:href="https://github.com/jersey/jersey/tags">https://github.com/jersey/jersey/tags</link>.
60+
<link xlink:href="https://github.com/eclipse-ee4j/jersey/tags">https://github.com/eclipse-ee4j/jersey/tags</link>.
6161
</para>
6262
</section>
6363

‎docs/src/main/docbook/jaxrs-resources.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
33
4-
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -53,7 +53,7 @@
5353
resource class using JAX-RS annotations. The example code shown here is
5454
from one of the samples that ships with Jersey, the zip file of which can
5555
be found in the maven repository
56-
<link xlink:href="https://maven.java.net/content/repositories/&repository;/org/glassfish/jersey/examples/helloworld/&version;/">here</link>.
56+
<link xlink:href="http://central.maven.org/maven2/org/glassfish/jersey/examples/helloworld//&version;/">here</link>.
5757
</para>
5858
<para>
5959
<example>

‎docs/src/main/docbook/jersey.ent

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="iso-8859-1" ?>
22
<!--
33
4-
Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,7 +33,7 @@
3333
<!ENTITY jackson.javadoc.version "$jackson-version">
3434
<!-- temporary hardcoded javadoc version - the correct one is missing at the provider's web -->
3535
<!ENTITY jackson.javadoc.temp.version "2.3.0">
36-
<!ENTITY repository "$repository">
36+
<!--<!ENTITY repository "$repository">-->
3737
<!ENTITY src.branch "$src.branch">
3838
<!ENTITY version "$version">
3939

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

6060
<!ENTITY jersey.ext.bean-validation.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-bean-validation/dependencies.html'>jersey-bean-validation</link>" >
@@ -75,14 +75,14 @@
7575
<!ENTITY jersey.ext.mvc-jsp.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-mvc-jsp/dependencies.html'>jersey-mvc-jsp</link>" >
7676
<!ENTITY jersey.ext.mvc-mustache.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-mvc-mustache/dependencies.html'>jersey-mvc-mustache</link>" >
7777
<!ENTITY jersey.ext.spring4.deps.link "<link xlink:href='&jersey.project-info.uri.prefix;/jersey-spring4/dependencies.html'>jersey-spring4</link>" >
78-
<!ENTITY jersey.docs.root.uri "https://jersey.github.io/documentation/&docs.version;">
78+
<!ENTITY jersey.docs.root.uri "https://eclipse-ee4j.github.io/jersey.github.io/documentation/&docs.version;">
7979
<!ENTITY jersey.docs.index.uri "&jersey.docs.root.uri;/index.html">
8080
<!ENTITY jersey.github.examples.uri "&jersey.github.release.uri;/examples">
81-
<!ENTITY jersey.github.base.uri "https://github.com/jersey/jersey/tree">
81+
<!ENTITY jersey.github.base.uri "https://github.com/eclipse-ee4j/jersey/tree">
8282
<!ENTITY jersey.github.release.uri "&jersey.github.base.uri;/&src.branch;">
83-
<!ENTITY jersey.javadoc.root.uri "https://jersey.github.io/apidocs/&apidocs.version;/jersey">
83+
<!ENTITY jersey.javadoc.root.uri "https://eclipse-ee4j.github.io/jersey.github.io/apidocs/&apidocs.version;/jersey">
8484
<!ENTITY jersey.javadoc.uri.prefix "&jersey.javadoc.root.uri;/org/glassfish/jersey">
85-
<!ENTITY jersey.project-info.uri.prefix "https://jersey.github.io/project-info/&version;/jersey/project">
85+
<!ENTITY jersey.project-info.uri.prefix "https://eclipse-ee4j.github.io/jersey.github.io/project-info/&version;/jersey/project">
8686
<!ENTITY jee.javadoc.uri "http://docs.oracle.com/javaee/7/api">
8787
<!ENTITY jdk6.javadoc.uri "http://docs.oracle.com/javase/6/docs/api">
8888
<!ENTITY jdk7.javadoc.uri "http://docs.oracle.com/javase/7/docs/api">
@@ -99,7 +99,7 @@
9999
<!ENTITY rxjava.link "<link xlink:href='&rxjava.uri;'>RxJava</link>">
100100
<!ENTITY rxjava.uri "https://github.com/ReactiveX/RxJava">
101101
<!ENTITY wikipedia.uri "http://en.wikipedia.org/wiki/">
102-
<!ENTITY jira.uri.prefix "https://java.net/jira/browse">
102+
<!ENTITY jira.uri.prefix "https://github.com/eclipse-ee4j/jersey/issues">
103103

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

0 commit comments

Comments
 (0)