Skip to content

Commit

Permalink
Changed references for SUN to Oracle.
Browse files Browse the repository at this point in the history
  • Loading branch information
aKandzior committed Jun 29, 2011
1 parent 9d638cf commit 001cf71
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 26 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
/bin
/.project
/.settings/org.eclipse.jdt.ui.prefs
/.settings/*
32 changes: 11 additions & 21 deletions install.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,32 +37,23 @@ <h1>OpenCms 8.0.1 installation</h1>
<h2>
<a id="a1" name="a1"></a>Install the Java 2 SDK, version 1.5 or newer</h2>

<p>Install the Java 2 SDK, version 5 or newer (from SUN
<p>Install the Java JDK, version 5 or newer (from Oracle
<code>
<a href="http://java.sun.com/products/j2se/" target="_blank"
title="External link, opens in new window">http://java.sun.com/products/j2se/</a></code>). For details on how to install these components on your operating system, see the
<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html" target="_blank"
title="External link, opens in new window">http://www.oracle.com/technetwork/java/javase/downloads/index.html</a></code>). For details on how to install these components on your operating system, see the
documentation that comes with them. You must install the Java
<em>SDK</em>, not the
<em>JRE</em> (Java Runtime Environment) that is also available from SUN. The JRE is
<em>JDK</em> (Java Development Kit), not the
<em>JRE</em> (Java Runtime Environment) that is also available from Oracle. The JRE is
<em>not</em> sufficient to run OpenCms!</p>
<p>
<strong>Important</strong>: OpenCms 8.0.1 was tested with Java 5 (1.5) and 6 (1.6).</p>

<p>
<strong>Please note:</strong> FreeBSD users may need to setup new entropy sources in the O/S using
<code>rndcontrol</code>. Otherwise the installation process may hang. For example, on a machine
with a network interface card on IRQs 9, you can execute</p>
<p>
<code>rndcontrol -s 9</code>
</p>
<h2>
<a id="a2" name="a2"></a>Install Tomcat</h2>
<p>OpenCms 8.0.1 requires a Servlet 2.4 / JSP 2.0 standards compliant container. Tomcat 5 is the
reference implementation of this Standard. This release was tested with Tomcat 5.0.x, Tomcat
5.5.x and Tomcat 6.0.x. Older versions of Tomcat (4.x and earlier) do not support this newer standard and are thus
not usable for OpenCms 8.0.1.</p>
<p>Install Tomcat from
<p>OpenCms 8.0.1 requires a Servlet 2.4 / JSP 2.0 standards compliant container.
This release was tested with Tomcat 5.5.x, Tomcat 6.0.x. and Tomcat 7.0.x.</p>

<p>Install Tomcat from
<code>
<a href="http://tomcat.apache.org"
target="_blank" title="External link, opens in new window">http://tomcat.apache.org</a>
Expand Down Expand Up @@ -101,8 +92,7 @@ <h2>
<code>C:\</code> drive and should be registered as service using
<code>%MYSQL_HOME%/bin/mysqld -install</code>.</p>

<p>OpenCms can be used with MySQL 4.0, 4.1 and 5.0. For performance reasons we recommend MySQL
5.0.</p>
<p>OpenCms can be used with MySQL 5.0, 5.1 and 5.5.</p>
<p>Start the MySQL server by running the service (WIN32) or executing
<code>%MYSQL_HOME%/bin/mysqld</code> (UNIX).</p>
<p>Check that MySQL is running before you continue by starting the MySQL monitor (execute
Expand All @@ -113,8 +103,8 @@ <h2>
<strong>Important:</strong> You will have to increase the MySQL configuration variable
<code>max_allowed_packet</code> located in the MySQL configuration file (usually called

<code>my.ini</code>). For OpenCms, the limit should be as high as possible, a setting of
<code>max_allowed_packet=32M</code> is recommended.</p>
<code>my.ini</code>). For OpenCms, the limit should be as high as possible, a setting of at least
<code>max_allowed_packet=16M</code> is recommended.</p>
<h2>
<a id="a4" name="a4"></a>Deploy the
<code>opencms.war</code> file</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<p><strong>Nachteil:</strong></p>
<ul>
<li>etwas längere Ladezeit der Benutzeroberfläche.</li><li>Es wird eine kostenlose Zusatzsoftware benötigt: Die
„Java Virtual Machine“ der Firma Sun.</li><li>Der Ort auf Ihrer Festplatte, von dem aus Sie hochladen wird
„Java Virtual Machine“ der Firma Oracle.</li><li>Der Ort auf Ihrer Festplatte, von dem aus Sie hochladen wird
nicht gespeichert. Wenn Sie erneut hochladen, müssen Sie in der
Oberfläche erneut an diesen Ort navigieren. Dies kann bei
inkrementellem Arbeiten aufwändig sein, wenn Ihre Bilddateien unter
Expand Down
6 changes: 3 additions & 3 deletions webapp/setup/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ <h2>Usage license</h2>
Alkacon OpenCms and the OpenCms logo are registered trademarks of Alkacon Software GmbH in Germany, the United States
and other countries.
</i></p>
<p><i>Sun, Sun Microsystems, Solaris, Java,
JavaServer Web Development Kit, and JavaServer Pages are trademarks or registered trademarks of Sun Microsystems,
Inc. UNIX is a registered trademark in the United States and other countries,
<p><i>Sun, Sun Microsystems, Solaris, Java, J2EE,
JavaServer Web Development Kit, and JavaServer Pages are trademarks or registered trademarks of Oracle Corporation.
UNIX is a registered trademark in the United States and other countries,
exclusively licensed through X/Open Company, Ltd. Windows, WindowsNT,
and Win32 are registered trademarks of Microsoft Corp.
All other product names mentioned herein and throughout the entire web site are trademarks of their respective owners.</i></p>
Expand Down

0 comments on commit 001cf71

Please sign in to comment.