1 |
nightmorph 11/05/09 19:16:31 |
2 |
|
3 |
Modified: java.xml |
4 |
Log: |
5 |
update java jdk/jre list, make icedtea a bit more prominent, address ACCEPT_LICENSE, misc fixes. bug 366261 and bug 366257. |
6 |
|
7 |
Revision Changes Path |
8 |
1.50 xml/htdocs/doc/en/java.xml |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?rev=1.50&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?rev=1.50&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/xml/htdocs/doc/en/java.xml?r1=1.49&r2=1.50 |
13 |
|
14 |
Index: java.xml |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v |
17 |
retrieving revision 1.49 |
18 |
retrieving revision 1.50 |
19 |
diff -u -r1.49 -r1.50 |
20 |
--- java.xml 6 Jul 2010 11:51:28 -0000 1.49 |
21 |
+++ java.xml 9 May 2011 19:16:31 -0000 1.50 |
22 |
@@ -1,6 +1,6 @@ |
23 |
<?xml version="1.0" encoding="UTF-8"?> |
24 |
-<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.49 2010/07/06 11:51:28 jkt Exp $ --> |
25 |
<!DOCTYPE guide SYSTEM "/dtd/guide.dtd"> |
26 |
+<!-- $Header: /var/cvsroot/gentoo/xml/htdocs/doc/en/java.xml,v 1.50 2011/05/09 19:16:31 nightmorph Exp $ --> |
27 |
|
28 |
<guide> |
29 |
<title>Gentoo Java Guide</title> |
30 |
@@ -24,8 +24,8 @@ |
31 |
<!-- See http://creativecommons.org/licenses/by-sa/2.5 --> |
32 |
<license/> |
33 |
|
34 |
-<version>0.23</version> |
35 |
-<date>2010-07-06</date> |
36 |
+<version>1</version> |
37 |
+<date>2011-05-09</date> |
38 |
|
39 |
<chapter> |
40 |
<title>What is Java?</title> |
41 |
@@ -113,6 +113,11 @@ |
42 |
<ti>BEA WebLogic's J2SE Development Kit</ti> |
43 |
<ti>dev-java/jrockit-jdk-bin</ti> |
44 |
</tr> |
45 |
+<tr> |
46 |
+ <ti>The IcedTea Open Java Kit</ti> |
47 |
+ <ti>dev-java/icedtea</ti> |
48 |
+ <ti>dev-java/icedtea6-bin</ti> |
49 |
+</tr> |
50 |
</table> |
51 |
|
52 |
<!-- |
53 |
@@ -132,9 +137,19 @@ |
54 |
</p> |
55 |
|
56 |
<p> |
57 |
-In recent events, Sun has relicensed their JDK and JRE under a more Linux |
58 |
-distro friendly license. As a result, Sun Java 1.5 and onwards are |
59 |
-freely downloadable, without any further hassle. |
60 |
+Some JDKs and JREs, including the Sun packages, require accepting an End User |
61 |
+License Agreement, or EULA. If its license (such as dlj-1.1) is not listed in |
62 |
+ACCEPT_LICENSE in <path>/etc/make.conf</path>, then you won't be able to install |
63 |
+the JDK/JRE. For more information on how to add acceptable licenses to |
64 |
+<path>make.conf</path>, please read the <uri |
65 |
+link="/doc/en/handbook/handbook-x86.xml?part=2&chap=1#doc_chap4">Portage |
66 |
+Handbook</uri>. |
67 |
+</p> |
68 |
+ |
69 |
+<p> |
70 |
+To avoid any restrictive license hassle, consider installing <c>icedtea6-bin</c> |
71 |
+or <c>icedtea</c>, which are more open Java implementations from the OpenJDK |
72 |
+project. |
73 |
</p> |
74 |
|
75 |
<note> |
76 |
@@ -280,8 +295,7 @@ |
77 |
</p> |
78 |
|
79 |
<p> |
80 |
-Of course, Gentoo is all about choice, so you can override these defaults (and even your |
81 |
-selected system VM) in |
82 |
+You can override these defaults (and even your selected system VM) in |
83 |
<path>/etc/java-config-2/build/jdk.conf</path> and have complete control over |
84 |
which VM will get used for merging. Some examples: |
85 |
</p> |
86 |
@@ -305,10 +319,10 @@ |
87 |
|
88 |
<warn> |
89 |
You do not <e>have</e> to edit this file. If you change these options to use a |
90 |
-unsupported VM, things could possibly break. Because of the wide variety of available |
91 |
-VMs, we do not have the resources to test and verify every package works on all of them. |
92 |
-Bugs reported with a unsupported VM won't be prioritized as much as bugs present within |
93 |
-supported VMs. |
94 |
+unsupported VM, things could possibly break. Because of the wide variety of |
95 |
+available VMs, we do not have the resources to test and verify every package |
96 |
+works on all of them. Bugs reported with a unsupported VM won't be prioritized |
97 |
+as much as bugs present within supported VMs. |
98 |
</warn> |
99 |
|
100 |
</body> |
101 |
@@ -321,9 +335,9 @@ |
102 |
<body> |
103 |
|
104 |
<p> |
105 |
-The standard Java compiler used for building is javac, which comes with each |
106 |
-JDK. In addition to configuring the VM used at build time, it is also possible |
107 |
-configure which compiler is used. Essentially, you define a list your |
108 |
+The standard Java compiler used for building is <c>javac</c>, which comes with |
109 |
+each JDK. In addition to configuring the VM used at build time, it is also |
110 |
+possible configure which compiler is used. Essentially, you define a list your |
111 |
preference for which compiler to use in |
112 |
<path>/etc/java-config-2/build/compilers.conf</path>. |
113 |
</p> |