svn commit: r46415 - head/en_US.ISO8859-1/htdocs/java

Author: eadler
Date: Wed Apr  1 20:03:09 2015
New Revision: 46415
URL: https://svnweb.freebsd.org/changeset/doc/46415

Log:
  htdocs/java: include the installation on the main page
  
  - simplify installation instructions

Deleted:
  head/en_US.ISO8859-1/htdocs/java/install.xml
Modified:
  head/en_US.ISO8859-1/htdocs/java/Makefile
  head/en_US.ISO8859-1/htdocs/java/index.xml

Modified: head/en_US.ISO8859-1/htdocs/java/Makefile
==============================================================================
--- head/en_US.ISO8859-1/htdocs/java/Makefile	Wed Apr  1 18:55:49 2015	(r46414)
+++ head/en_US.ISO8859-1/htdocs/java/Makefile	Wed Apr  1 20:03:09 2015	(r46415)
@@ -8,7 +8,6 @@
 .endif
 
 DOCS+=  index.xml
-DOCS+=  install.xml
 
 DATA=	j2j.gif
 

Modified: head/en_US.ISO8859-1/htdocs/java/index.xml
==============================================================================
--- head/en_US.ISO8859-1/htdocs/java/index.xml	Wed Apr  1 18:55:49 2015	(r46414)
+++ head/en_US.ISO8859-1/htdocs/java/index.xml	Wed Apr  1 20:03:09 2015	(r46415)
@@ -16,42 +16,73 @@
   <a href="http://java.sun.com/"><img src="j2j.gif" hspace="10"
     border="0" alt="Jump to &java;" align="right"/></a>
 
-  <p>The &openjdk; project provides an open-source implementation of the &java;
-    SE Platform and is available in versions 6 and 7 for all supported
-    FreeBSD releases on the i386 and amd64 platforms.  Both versions can be
-    installed by building from sources using the FreeBSD Ports Collection
-    (<code>openjdk6</code> and <code>openjdk7</code>, respectively) and
-    are also distributed as a prebuilt binary package via the FreeBSD mirrors
-    and can be installed directly using <code>pkg(8)</code>.</p>
-
-  <p>&openjdk; is the recommended &java; implementation on FreeBSD.
-    The FreeBSD Foundation is no longer providing supported &java; &jdk; and
-    &jre; packages based on Sun's partner sources.  Older packages for &java;
-    &jdk; and &jre; 5.0 and 6.0 are still available below for reference and
-    legacy use only, but are no longer supported.</p>
-
-  <p>Further information about downloading the unsupported binaries is
-    available from the
-    <a href="http://www.FreeBSDFoundation.org/java">FreeBSD
-    Foundation &java; Downloads</a> page.</p>
-
   <h2>Getting Java</h2>
 
-  <p><a href="install.html">Getting &java; for FreeBSD</a> describes
-    how to install &java;</p>
+  <p>There are two choices of Java Development Kits on FreeBSD:</p>
+
+  <ul>
+
+  <li>
+    <h3>OpenJDK</h3>
+
+    <p>The &openjdk; project provides a native open-source
+      implementation of the &java; SE Platform and is available in
+      versions 6 and 7 for all supported FreeBSD releases on the i386
+      and amd64 platforms. Both versions can be installed using the
+      usual methods of package installation (<code>openjdk6</code> and
+      <code>openjdk7</code>)</p>
+
+    <p>To install &openjdk; 7 package use the pkg(8) utility:</p>
+
     <p>
-    &openjdk; 7 is frequently updated, and it is suggested to refer to a
+      <code>pkg install openjdk7</code>
+      <br/>
+      or
+      <br/>
+      <code>cd /usr/ports/java/openjdk7
+      <br/>make install clean
+      </code>
+    </p>
+
+    <p>&openjdk; 7 is frequently updated, and it is suggested to refer to a
     <a href="http://svnweb.freebsd.org/ports/head/java/openjdk7/Makefile?view=log">revision log</a> for
     detailed release history. Additionally, one may choose to review more information at
-    <a href="http://www.freshports.org/java/openjdk7">FreshPorts</a>.
-    </p>
+    <a href="http://www.freshports.org/java/openjdk7">FreshPorts</a>.</p>
 
-    <p>
-    &openjdk; 6 is frequently updated, and it is suggested to refer to a
+    <p>&openjdk; 6 is frequently updated, and it is suggested to refer to a
     <a href="http://svnweb.freebsd.org/ports/head/java/openjdk6/Makefile?view=log">revision log</a> for
     detailed release history. Additionally, one may choose to review more information at
-    <a href="http://www.freshports.org/java/openjdk6">FreshPorts</a>.
-    </p>
+    <a href="http://www.freshports.org/java/openjdk6">FreshPorts</a>.</p>
+  </li>
+
+  <li>
+    <h3>Oracle JDK for Linux</h3>
+
+    <p>This port installs the Java Development Kit from Oracle which was built for Linux. It will run under FreeBSD using the Linux compatibility.</p>
+
+    <p><code>cd /usr/ports/java/linux-sun-jdk17
+    <br/>make install clean
+    </code></p>
+
+    <p><b>Note:</b> Please note that due to the current licensing policy the
+    Oracle JDK on FreeBSD binaries can not be distributed and you are only
+    permitted to use them personally.  For the same reason, the sources
+    must be fetched manually.</p>
+  </li>
+
+  <li>
+    <h3>Legacy Native JDK</h3>
+    <p>The FreeBSD Foundation is no longer providing supported &java; &jdk; and
+      &jre; packages based on Sun's partner sources.  Older packages for &java;
+      &jdk; and &jre; 5.0 and 6.0 are still available below for reference and
+      legacy use only, but are no longer supported.</p>
+
+    <p>Further information about downloading the unsupported binaries is
+      available from the
+      <a href="http://www.FreeBSDFoundation.org/java">FreeBSD
+      Foundation &java; Downloads</a> page.</p>
+  </li>
+  </ul>
 
   <h2>Documentation</h2>
 
@@ -59,7 +90,6 @@
     <li><a href="&url.books;/porters-handbook/using-java.html">Creating Ports</a></li>
   </ul>
 
-
   <h2>I want to help by...</h2>
 
   <h3>... testing</h3>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-doc-all
To unsubscribe, send any mail to "[email protected]"