This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 86915f6 Automated site publishing by Jenkins build 502
86915f6 is described below
commit 86915f602fb6e9418412bb2ee1c2e5ec138ea398
Author: jenkins <[email protected]>
AuthorDate: Thu Jan 24 22:35:23 2019 +0000
Automated site publishing by Jenkins build 502
---
content/kb/docs/ide/java-db.html | 45 +++++++++--------------------
content/kb/docs/ide/oracle-db.html | 58 --------------------------------------
2 files changed, 14 insertions(+), 89 deletions(-)
diff --git a/content/kb/docs/ide/java-db.html b/content/kb/docs/ide/java-db.html
index 384f7ee..24a1167 100644
--- a/content/kb/docs/ide/java-db.html
+++ b/content/kb/docs/ide/java-db.html
@@ -101,12 +101,6 @@
<div class="paragraph">
<p>The Java DB database is Sun’s supported distribution of <a
href="http://db.apache.org/derby/";>Apache Derby</a>. Java DB is a fully
transactional, secure, standards-based database server, written entirely in
Java, and fully supports SQL, JDBC API, and Java EE technology. The Java DB
database is packaged with the <a
href="http://glassfish.dev.java.net/";>GlassFish</a> application server, and is
included in <a href="http://download.oracle.com/javase/6/";>JDK 6</a> as well.
For more i [...]
</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/netbeans-stamp-80-74-73.png" alt="netbeans stamp 80 74 73">
-</div>
-<div class="title">Figure 1. Content on this page applies to the NetBeans IDE
7.2, 7.3, 7.4 and 8.0</div>
-</div>
<div class="paragraph">
<p><strong>To follow this tutorial, you need the following software and
resources.</strong></p>
</div>
@@ -123,28 +117,22 @@
</thead>
<tbody>
<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a
href="https://netbeans.org/downloads/index.html";>NetBeans IDE</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">7.2, 7.3,
7.4, 8.0, Java EE</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>Java
Development Kit (JDK)</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Version 7
or 8</p></td>
-</tr>
-<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Java
DB</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">version
10.4.x, 10.5.x</p></td>
</tr>
</tbody>
</table>
-<div class="paragraph">
-<p><strong>Note.</strong></p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>Java DB is installed when you install JDK 7 or JDK 8 (except on Mac OS X).
If you are using Mac OS X you can download and install <a
href="http://www.oracle.com/technetwork/java/javadb/downloads/index.html";>Java
DB</a> manually or use the Java DB that is installed by Java EE version of the
NetBeans IDE installer.</p>
-</li>
-</ul>
+<div class="admonitionblock note">
+<table>
+<tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content">
+Java DB is installed when you install JDK 7 or JDK 8 (except on Mac OS X). If
you are using Mac OS X you can download and install <a
href="http://www.oracle.com/technetwork/java/javadb/downloads/index.html";>Java
DB</a> manually or use the Java DB that is installed by Java EE version of the
NetBeans IDE installer.
+</td>
+</tr>
+</table>
</div>
</div>
</div>
@@ -220,7 +208,7 @@
<div class="content">
<img src="images/javadb-props.png" alt="javadb props">
</div>
-<div class="title">Figure 2. example of default settings of Java DB server and
database</div>
+<div class="title">Figure 1. example of default settings of Java DB server and
database</div>
</div>
<div class="paragraph">
<p><strong>Note.</strong> If the Database Location field is empty you will
need to set the path to the directory that contains your databases. You will
need to create a directory for the databases if no directory exists.</p>
@@ -473,13 +461,8 @@ In the Recreate Table dialog box, navigate to the location
where you saved the
At this point you can change the table name or edit the table definition.
Otherwise, click OK to immediately create the table in the
<code>contact</code> database. A new <code>CUSTOMER</code> table node
appears beneath the <code>Contact</code> DB connection node.</p>
<p class="tableblock">image::images/new-customer-node.png[]</p>
<p class="tableblock">If you view the data in the new <code>CUSTOMER</code>
table you will see that there are no records in the database, but that the
structure of the table is identical to the table that you grabbed.</p>
-<p class="tableblock"><a
href="/about/contact_form.html?to=3&subject=Feedback:%20Working%20With%20Java%20DB">Send
Us Your Feedback</a></p>
-<p class="tableblock">== See Also</p>
-<p class="tableblock">This concludes the Working with the Java DB (Derby)
Database tutorial. This tutorial demonstrated how to set up a connection to the
Java DB database in NetBeans IDE. It then demonstrated how to create, view,
modify and delete tables in the IDE’s Services window. It also showed how
work with the SQL Editor to add data to tables, and use the IDE’s
functionality allowing you to recreate tables using definitions from other
databases.</p>
-<p class="tableblock">For related and more advanced tutorials, see the
following resources:</p>
-<p class="tableblock">* <a href="mysql.html">Connecting to a MySQL
Database</a>. Demonstrates how to configure and connect to a MySQL database in
NetBeans IDE.
-* <a href="../web/mysql-webapp.html">Creating a Simple Web Application Using a
MySQL Database</a>. Demonstrates how to create a simple web application that
connects to a MySQL database server.
-* <a href="http://platform.netbeans.org/tutorials/nbm-crud.html";>NetBeans
Platform CRUD Application Tutorial.</a> Demonstrates how to integrate a Java DB
database into a NetBeans Platform application.</p></td>
+<p class="tableblock">== Conclusion</p>
+<p class="tableblock">This concludes the Working with the Java DB (Derby)
Database tutorial. This tutorial demonstrated how to set up a connection to the
Java DB database in NetBeans IDE. It then demonstrated how to create, view,
modify and delete tables in the IDE’s Services window. It also showed how
work with the SQL Editor to add data to tables, and use the IDE’s
functionality allowing you to recreate tables using definitions from other
databases.</p></td>
</tr>
</tbody>
</table>
diff --git a/content/kb/docs/ide/oracle-db.html
b/content/kb/docs/ide/oracle-db.html
index 09d0a26..412683a 100644
--- a/content/kb/docs/ide/oracle-db.html
+++ b/content/kb/docs/ide/oracle-db.html
@@ -96,7 +96,6 @@
<li><a href="#_oci_8_and_the_netbeans_ide_for_php">OCI 8 and the NetBeans IDE
for PHP</a></li>
<li><a href="#_using_oci_jdbc_driver_with_the_netbeans_ide">Using OCI JDBC
Driver with the NetBeans IDE</a></li>
<li><a href="#_troubleshooting">Troubleshooting</a></li>
-<li><a href="#_see_also">See Also</a></li>
</ul>
</div>
<div id="preamble">
@@ -107,12 +106,6 @@
<div class="paragraph">
<p>This document shows how to <a href="#connect">set up a connection to a
local installation</a> of Oracle Database XE from the NetBeans IDE, use the
IDE’s built-in SQL editor to <a href="#createuser">handle the database
data</a>, and how to <a href="#oci8">enable the OCI 8 PHP extension</a> to
write PHP code that connects to an Oracle database.</p>
</div>
-<div class="imageblock">
-<div class="content">
-<img src="images/netbeans-stamp-80-74-73.png" alt="netbeans stamp 80 74 73">
-</div>
-<div class="title">Figure 1. Content on this page applies to the NetBeans IDE
7.2, 7.3, 7.4 and 8.0</div>
-</div>
<div class="paragraph">
<p><strong>To follow this tutorial, you need the following software and
resources.</strong></p>
</div>
@@ -129,14 +122,6 @@
</thead>
<tbody>
<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a
href="https://netbeans.org/downloads/index.html";>NetBeans IDE</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">7.2, 7.3,
7.4, 8.0, Java EE bundle</p></td>
-</tr>
-<tr>
-<td class="tableblock halign-left valign-top"><p class="tableblock"><a
href="http://www.oracle.com/technetwork/java/javase/downloads/index.html";>Java
Development Kit (JDK)</a></p></td>
-<td class="tableblock halign-left valign-top"><p class="tableblock">Version 7
or 8</p></td>
-</tr>
-<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a
href="http://www.oracle.com/technetwork/database/express-edition/overview/index.html";>+Oracle
Database XE +</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">10
<em>g</em> Express Edition</p></td>
</tr>
@@ -749,49 +734,6 @@ image::images/oci-connection.png[]</p>
<div class="paragraph">
<p>In a general case, this means that the NLS_LANG environment variable
contains an invalid value for language, territory, or character set. If this is
your case, the invalid NLS_LANG settings should be disabled at your operating
system level. For Windows, rename the NLS_LANG subkey in your Windows registry
at \HKEY_LOCAL_MACHINE\SOFTWARE\ORACLE. For Linux/Unix, run the command "unset
NLS_LANG".</p>
</div>
-<div class="paragraph">
-<p><a
href="/about/contact_form.html?to=3&subject=Feedback:%20Connecting%20to%20Oracle%20Database%20from%20NetBeans%20IDE">Send
Us Your Feedback</a></p>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_see_also">See Also</h2>
-<div class="sectionbody">
-<div class="paragraph">
-<p>For more information about administering and working with Oracle Database,
see the corresponding Oracle’s documentation. Below we provide a brief
list of most commonly used documentation</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a
href="http://download.oracle.com/docs/cd/E11882_01/server.112/e17118/toc.htm";>Oracle
Database SQL Reference</a>. A complete description of SQL statements used to
handle information in Oracle Database.</p>
-</li>
-<li>
-<p><a
href="http://download.oracle.com/docs/cd/E11882_01/network.112/e16543/toc.htm";>Oracle
Database Security Guide</a>. Provides and explains major concepts used in
managing an Oracle Database.</p>
-</li>
-<li>
-<p><a
href="http://st-curriculum.oracle.com/tutorial/DBXETutorial/index.htm";>Oracle
Database 10_g_ Express Edition Tutorial</a>. A quick but detailed introduction
into using Oracle Database XE.</p>
-</li>
-<li>
-<p><a
href="http://www.oracle.com/technetwork/articles/technote-php-instant-084410.html";>Installing
PHP and the Oracle Instant Client for Linux and Windows</a>. A straightforward
how-to article about installing PHP and Oracle Instant Client.</p>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>For information on how to work with other databases in the NetBeans IDE,
see</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p><a href="java-db.html">Working with the Java DB (Derby) Database</a></p>
-</li>
-<li>
-<p><a href="mysql.html">Connecting to a MySQL Database</a></p>
-</li>
-<li>
-<p><a href="../web/mysql-webapp.html">Creating a Simple Web Application Using
a MySQL Database</a></p>
-</li>
-</ul>
-</div>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
