Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit 5c33bfa

Browse files
pranjal10yaminikb
authored andcommitted
Fixes #22259: GlassFish docs files migration (#22260)
1 parent 882f278 commit 5c33bfa

14 files changed

Lines changed: 1471 additions & 15 deletions

File tree

appserver/connectors/admin/src/main/manpages/org/glassfish/connectors/admin/cli/flush-connection-pool.1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ DESCRIPTION
3232
The jndi-name for application-scoped-resources or
3333
module-scoped-resources are specified using the format
3434
java:app/jdbc/myDataSource or java:module/jdbc/myModuleLevelDataSource.
35-
This naming scope is defined in the Java EE 6 Specification
36-
(http://download.oracle.com/javaee/6/api/).
35+
This naming scope is defined in the Java EE 8 Specification
36+
(https://javaee.github.io/javaee-spec/javadocs/).
3737

3838
OPTIONS
3939
--help, -?
@@ -68,4 +68,4 @@ SEE ALSO
6868

6969
asadmin(1M)
7070

71-
Java EE 8 10 Feb 2011 flush-connection-pool(1)
71+
Java EE 8 31 Aug 2017 flush-connection-pool(1)

appserver/ejb/ejb-container/src/main/manpages/org/glassfish/ejb/admin/cli/list-timers.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ SEE ALSO
4646

4747
asadmin(1M)
4848

49-
"Using the Timer Service" in The Java EE 6 Tutorial
49+
"Using the Timer Service" in The Java EE 8 Tutorial
5050

5151
"EJB Timer Service" in Oracle GlassFish Server Application Development
5252
Guide
5353

54-
Java EE 8 12 Oct 2010 list-timers(1)
54+
Java EE 8 31 Aug 2017 list-timers(1)

appserver/transaction/jta/src/main/manpages/org/glassfish/jta/admin/cli/freeze-transaction-service.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ SEE ALSO
6161
"Administering Transactions" in Oracle GlassFish Server Administration
6262
Guide
6363

64-
"Transactions" in The Java EE 6 Tutorial
64+
"Transactions" in The Java EE 8 Tutorial
6565

66-
Java EE 8 09 Aug 2017 freeze-transaction-service(1)
66+
Java EE 8 31 Aug 2017 freeze-transaction-service(1)

appserver/transaction/jta/src/main/manpages/org/glassfish/jta/admin/cli/unfreeze-transaction-service.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ SEE ALSO
5858
"Administering Transactions" in Oracle GlassFish Server Administration
5959
Guide
6060

61-
"Transactions" in The Java EE 6 Tutorial
61+
"Transactions" in The Java EE 8 Tutorial
6262

63-
Java EE 8 09 Aug 2017 unfreeze-transaction-service(1)
63+
Java EE 8 31 Aug 2017 unfreeze-transaction-service(1)

nucleus/admin/template/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
<configuration>
7373
<artifactItems>
7474
<artifactItem>
75-
<groupId>org.glassfish.docs</groupId>
76-
<artifactId>basedocs</artifactId>
77-
<version>${v3-docs.version}</version>
75+
<groupId>org.glassfish.main</groupId>
76+
<artifactId>docs</artifactId>
77+
<version>${project.version}</version>
7878
<type>zip</type>
7979
<overWrite>false</overWrite>
8080
<includes>glassfish/lib/templates/**</includes>

nucleus/docs/pom.xml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5+
6+
Copyright (c) 2017 Oracle and/or its affiliates. All rights reserved.
7+
8+
The contents of this file are subject to the terms of either the GNU
9+
General Public License Version 2 only ("GPL") or the Common Development
10+
and Distribution License("CDDL") (collectively, the "License"). You
11+
may not use this file except in compliance with the License. You can
12+
obtain a copy of the License at
13+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
14+
or LICENSE.txt. See the License for the specific
15+
language governing permissions and limitations under the License.
16+
17+
When distributing the software, include this License Header Notice in each
18+
file and include the License file at LICENSE.txt.
19+
20+
GPL Classpath Exception:
21+
Oracle designates this particular file as subject to the "Classpath"
22+
exception as provided by Oracle in the GPL Version 2 section of the License
23+
file that accompanied this code.
24+
25+
Modifications:
26+
If applicable, add the following below the License Header, with the fields
27+
enclosed by brackets [] replaced by your own identifying information:
28+
"Portions Copyright [year] [name of copyright owner]"
29+
30+
Contributor(s):
31+
If you wish your version of this file to be governed by only the CDDL or
32+
only the GPL Version 2, indicate your decision by adding "[Contributor]
33+
elects to include this software in this distribution under the [CDDL or GPL
34+
Version 2] license." If you don't indicate a single choice of license, a
35+
recipient has the option to distribute your version of this file under
36+
either the CDDL, the GPL Version 2 or to extend the choice of license to
37+
its licensees as provided above. However, if you add GPL Version 2 code
38+
and therefore, elected the GPL Version 2 license, then the option applies
39+
only if the new code is made subject to such option by the copyright
40+
holder.
41+
42+
-->
43+
44+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
45+
<modelVersion>4.0.0</modelVersion>
46+
<parent>
47+
<groupId>org.glassfish.main</groupId>
48+
<artifactId>glassfish-nucleus-parent</artifactId>
49+
<version>5.0-SNAPSHOT</version>
50+
<relativePath>../pom.xml</relativePath>
51+
</parent>
52+
<artifactId>docs</artifactId>
53+
<packaging>distribution-fragment</packaging>
54+
<name>Basic set of documentation for Glassfish distributions</name>
55+
<build>
56+
<resources>
57+
<resource>
58+
<directory>src/main/resources</directory>
59+
<excludes>
60+
<exclude>**/*.jar</exclude>
61+
</excludes>
62+
</resource>
63+
</resources>
64+
</build>
65+
66+
</project>
67+
Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
2+
<html lang="en">
3+
<!--
4+
5+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
6+
7+
Copyright (c) 2010-2017 Oracle and/or its affiliates. All rights reserved.
8+
9+
The contents of this file are subject to the terms of either the GNU
10+
General Public License Version 2 only ("GPL") or the Common Development
11+
and Distribution License("CDDL") (collectively, the "License"). You
12+
may not use this file except in compliance with the License. You can
13+
obtain a copy of the License at
14+
https://oss.oracle.com/licenses/CDDL+GPL-1.1
15+
or LICENSE.txt. See the License for the specific
16+
language governing permissions and limitations under the License.
17+
18+
When distributing the software, include this License Header Notice in each
19+
file and include the License file at LICENSE.txt.
20+
21+
GPL Classpath Exception:
22+
Oracle designates this particular file as subject to the "Classpath"
23+
exception as provided by Oracle in the GPL Version 2 section of the License
24+
file that accompanied this code.
25+
26+
Modifications:
27+
If applicable, add the following below the License Header, with the fields
28+
enclosed by brackets [] replaced by your own identifying information:
29+
"Portions Copyright [year] [name of copyright owner]"
30+
31+
Contributor(s):
32+
If you wish your version of this file to be governed by only the CDDL or
33+
only the GPL Version 2, indicate your decision by adding "[Contributor]
34+
elects to include this software in this distribution under the [CDDL or GPL
35+
Version 2] license." If you don't indicate a single choice of license, a
36+
recipient has the option to distribute your version of this file under
37+
either the CDDL, the GPL Version 2 or to extend the choice of license to
38+
its licensees as provided above. However, if you add GPL Version 2 code
39+
and therefore, elected the GPL Version 2 license, then the option applies
40+
only if the new code is made subject to such option by the copyright
41+
holder.
42+
43+
-->
44+
45+
<head>
46+
<style type="text/css">
47+
body{margin-top:0}
48+
body,td,p,div,span,a,ul,ul li, ol, ol li, ol li b, dl,h1,h2,h3,h4,h5,h6,li {font-family:geneva,helvetica,arial,"lucida sans",sans-serif; font-size:10pt}
49+
h1 {font-size:18pt}
50+
h2 {font-size:14pt}
51+
h3 {font-size:12pt}
52+
code,kbd,tt,pre {font-family:monaco,courier,"courier new"; font-size:10pt;}
53+
li {padding-bottom: 8px}
54+
p.copy, p.copy a {font-family:geneva,helvetica,arial,"lucida sans",sans-serif; font-size:8pt}
55+
p.copy {text-align: center}
56+
table.grey1,tr.grey1,td.grey1{background:#f1f1f1}
57+
th {color:#ffffff; font-family:geneva,helvetica,arial,"lucida sans",sans-serif; font-size:12pt}
58+
td.insidehead {font-weight:bold; background:white; text-align: left;}
59+
a {text-decoration:none; color:#3E6B8A}
60+
a:visited{color:#917E9C}
61+
a:hover {text-decoration:underline}
62+
</style>
63+
<title>GlassFish Server - Installation Complete</title>
64+
</head>
65+
<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" link="#594fbf" vlink="#1005fb" alink="#333366"><table width="100%" border="0"
66+
cellspacing="4" cellpadding="2">
67+
<tbody>
68+
<tr>
69+
<td align="right" valign="top"> <a href="http://www.oracle.com">oracle.com</a> </td>
70+
</tr>
71+
<tr>
72+
<td align="left" valign="top" bgcolor="#587993"> <font color="#ffffff"><b>GlassFish Server 4.1</b></font></td>
73+
</tr>
74+
</tbody>
75+
</table> <h1>GlassFish Server - Installation Complete</h1>
76+
<!--
77+
<h2>Get Oracle GlassFish Server with Premier Support</h2>
78+
<p>For production deployments, consider
79+
Oracle GlassFish Server with <a href="http://www.oracle.com/support/premier/index.html">Oracle Premier Support for Software</a>. Premier Support helps lower
80+
the total cost and risk of owning your Oracle solutions, improve the return from your IT investment, and optimize the business value of your IT solutions.
81+
Benefits of Premier Support include product updates and enhancements, global reach, lifetime support, ecosystem support, and proactive, automated support.</p>
82+
-->
83+
<h2>Install and update additional software components</h2>
84+
<p>Use the <a href="http://wikis.oracle.com/display/IpsBestPractices/">Update Tool</a> to install and update
85+
additional technologies and frameworks such as:</p><ul>
86+
<li>OSGi HTTP Service</li>
87+
<li>Generic Resource Adapter for JMS</li>
88+
<li>OSGi Administration Console</li>
89+
</ul>
90+
<p>If you are using the web profile, you can also use Update Tool to obtain technologies that are included by default in the full platform, such as:</p><ul>
91+
<li>Enterprise Java Beans</li>
92+
<li><a href="http://metro.java.net/">Metro</a></li>
93+
<li><a href="http://jersey.java.net/">Jersey</a></li>
94+
</ul><p>To improve the user experience and optimize offerings to users, Oracle collects data about <a href="http://wikis.oracle.com/display/GlassFish/UsageMetrics">
95+
GlassFish Server usage</a> that is transmitted by the Update Tool installer as part of the automatic update processes. No personally identifiable information
96+
is collected by this process.</p>
97+
98+
<p>You can start Update Tool by running bin/updatetool from the GlassFish installation directory</p>
99+
100+
<h2>Join the GlassFish community</h2><p>Visit the <a href="http://glassfish.java.net">GlassFish Community</a> page for information
101+
about how to join the GlassFish community. The GlassFish community is developing an open source, production-quality, enterprise-class application server
102+
that implements the newest features of the Java&trade; Platform, Enterprise Edition (Java EE) platform and related enterprise technologies.</p><h2>Try the
103+
sample applications</h2><p>The <a href="../samples/index.html">sample applications</a> that are included with the Java EE 7 SDK demonstrate how to quickly
104+
compile, assemble, and deploy small, technology-focused applications.</p> <h2>Learn more about GlassFish Server</h2><p>Consult the following resources to
105+
learn more about GlassFish Server:</p><ul>
106+
<li><b><a href="quickstart.html">Quick Start Guide</a>:</b> Start here to learn about the GlassFish Server. The <cite>Quick Start Guide</cite> explains how
107+
to perform basic tasks such as starting the server, accessing the Administration Console, and deploying a sample application. </li>
108+
<li><b><a href="features.html">Features and resources</a>:</b> Learn more about key features of the GlassFish Server, including what's new; plus additional
109+
resources such as forums, mailing lists, support, and how to submit feedback.</li>
110+
<li><b><a href="https://glassfish.java.net/documentation.html">Product documentation</a>:</b> View the online product documentation for complete information about
111+
the GlassFish Server, including up-to-date release notes. </li>
112+
<li><b><a href="https://docs.oracle.com/javaee/7/firstcup/index.html">Your First Cup: An Introduction to the Java EE Platform</a>:</b> Follow this short tutorial
113+
for beginning Java EE programmers that shows how to develop a simple enterprise application from scratch. The sample application is a web application that
114+
consists of an Enterprise JavaBean&trade;, a JAX-RS web service, and a JavaServer Faces&trade; Facelet web front end.</li>
115+
<li><b><a href="https://docs.oracle.com/javaee/7/tutorial/index.html">The Java EE Tutorial</a>:</b> Learn more about the Java EE standards by following this
116+
beginner's guide to developing enterprise applications for the GlassFish Server. It includes working examples and step-by-step instructions for creating Java
117+
EE applications with these technologies: Web services, Java Servlets, JavaServer Pages (JSP), JSP Standard Tag Library (JSTL), Enterprise JavaBeans, Java
118+
Message Service, and Java EE Connector Architecture.</li>
119+
<li><b><a href="../../docs/api/index.html">Java&trade; Platform, Enterprise Edition (Java EE) API online documentation (<i>only in SDK bundle</i>):</a></b> View the
120+
API reference documentation for the GlassFish Server packages and related APIs. This documentation is generated from the source code by the Javadoc&trade;
121+
tool.<hr><p><b>Note &mdash; </b> The preceding link to the Java EE API online documentation is valid only if you obtained GlassFish Server through the Java
122+
EE SDK. If necessary, you can <a href="http://docs.oracle.com/javaee/7/api/">browse the Java EE API documentation online</a>.</p><hr> </li>
123+
</ul> <hr style="width: 80%; height: 2px;"> <p class="copy"><a href="http://www.oracle.com/corporate/">Company Info</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a
124+
href="http://www.oracle.com/corporate/contact/">Contact</a> &nbsp;&nbsp;|&nbsp;&nbsp; Copyright &copy; 2010, 2014 Oracle Corporation &nbsp;&nbsp;|&nbsp;&nbsp; <a
125+
href="./copyright.html">Legal Notices</a></p></body></html>

0 commit comments

Comments
 (0)