Skip to content
Snippets Groups Projects
Commit 424c907f authored by Brutzman, Don's avatar Brutzman, Don
Browse files

Merge branch 'master' of https://gitlab.nps.edu/Savage/Savage into master

parents 7b0fae75 0866e2c6
No related branches found
No related tags found
No related merge requests found
......@@ -64,6 +64,7 @@
<a href="#Subversion">Subversion</a>&nbsp;|
<a href="#telnet">telnet</a>&nbsp;|
<a href="#Time">Time</a>&nbsp;|
<a href="#Tomcat">Tomcat</a>&nbsp;|
<a href="#Tools">Tools</a>&nbsp;|
<a href="#Wikis">Wikis</a>&nbsp;|
<a href="#Writing">Writing</a>&nbsp;|
......@@ -849,14 +850,14 @@ Note that the -d switch is necessary for domain users.
which does not need to be installed separately.
</li>
<li>
OpenJDK <code style="color:darkgreen"><b>jdk-14</b></code>
OpenJDK <code style="color:darkgreen"><b>jdk-14.0.2</b></code>
is default Java version for Savage projects, used
under a
<a href="https://openjdk.java.net/legal/gplv2+ce.html" target="_blank">non-viral open-source license</a>.
</li>
<li>
Oracle &nbsp;&nbsp; &nbsp;
<code style="color:darkgreen"><b>jdk-14</b></code>
<code style="color:darkgreen"><b>jdk-14.0.2</b></code>
and
<code style="color:darkgreen"><b>jdk1.8.0_221</b></code>
are alternative Java versions used in current development.
......@@ -874,7 +875,7 @@ Note that the -d switch is necessary for domain users.
or
-->
<br />
&nbsp;&nbsp;&nbsp;&nbsp; <code style="color:darkgreen"><b>JAVA_HOME=C:\Program Files\Java\openjdk\jdk-14</b></code>
&nbsp;&nbsp;&nbsp;&nbsp; <code style="color:darkgreen"><b>JAVA_HOME=C:\Program Files\Java\openjdk\jdk-14.0.2</b></code>
<br />
&nbsp;&nbsp;&nbsp;&nbsp; <code style="color:darkgreen"><b>JAVA_HOME=C:\Program Files\Java\jdk-14</b></code>
<br />
......@@ -890,18 +891,9 @@ Note that the -d switch is necessary for domain users.
<pre>
$<b> java -version</b> &nbsp;&nbsp; # OpenJDK 14
openjdk version "14" 2020-03-17
OpenJDK Runtime Environment (build 14+36-1461)
OpenJDK 64-Bit Server VM (build 14+36-1461, mixed mode, sharing)
</pre>
</li>
<li>
<pre>
$<b> java -version</b> &nbsp;&nbsp; # Oracle JDK 14
java 13 2019-09-17
Java(TM) SE Runtime Environment (build 13+33)
Java HotSpot(TM) 64-Bit Server VM (build 13+33, mixed mode, sharing)
openjdk version "14.0.2" 2020-07-14
OpenJDK Runtime Environment (build 14.0.2+12-46)
OpenJDK 64-Bit Server VM (build 14.0.2+12-46, mixed mode, sharing)
</pre>
</li>
<li>
......@@ -1498,7 +1490,7 @@ need to be connected to the NPS intranet.
<li>
Includes
<a href="https://blogs.apache.org/netbeans" target="_blank">Blog</a>,
<a href="https://netbeans.apache.org/download/nb113/index.html" target="_NetBeans">NetBeans&nbsp;11.3&nbsp;features</a>,
<a href="https://netbeans.apache.org/download/nb120/index.html" target="_NetBeans">NetBeans&nbsp;12&nbsp;features</a>,
<a href="https://netbeans.apache.org/kb/docs/java" target="_NetBeans">tutorials</a>,
<a href="https://netbeans.apache.org/community" target="_NetBeans">Community</a>,
<a href="https://netbeans.apache.org/participate" target="_NetBeans">Participate</a>,
......@@ -1559,13 +1551,7 @@ need to be connected to the NPS intranet.
<code><b>NETBEANS_HOME/etc/netbeans.conf</b></code>
locations in the NetBeans installation directory tree:
<br />
<code style="color:darkgreen"><b>C:\Program&nbsp;Files\netbeans\NetBeans_11.3\etc\netbeans.conf</b></code> (default user settings)
or, noting subdirectory structure,
<br />
<code style="color:darkgreen"><b>C:\Program&nbsp;Files\NetBeans_11.2\etc\netbeans.conf</b></code> (default user settings)
or, noting hyphen,
<br />
<code style="color:darkgreen"><b>C:\Program&nbsp;Files\NetBeans-11.2\etc\netbeans.conf</b></code>
<code style="color:darkgreen"><b>C:\Program&nbsp;Files\NetBeans12.0\netbeans\etc\netbeans.conf</b></code> (default user settings)
or, for older versions of NetBeans,
<br />
<code style="color:darkgreen"><b>C:\Program&nbsp;Files\NetBeans 8.2\etc\netbeans.conf</b></code> (default user settings) or
......@@ -1579,7 +1565,7 @@ need to be connected to the NPS intranet.
by changing menu <i>Tools&nbsp;&gt;&nbsp;Java&nbsp;Platforms</i>
and also
<code style="color:darkgreen"><b>netbeans.conf</b></code> property
<code>netbeans_jdkhome="C:\Program Files\Java\openjdk\jdk-14"</code>
<code>netbeans_jdkhome="C:\Program Files\Java\openjdk\jdk-14.0.2"</code>
(for example).
</li>
<li>
......@@ -1995,7 +1981,6 @@ netbeans_jdkhome="C:\Program Files\Java\jdk1.8.0_221"</pre>
Tomcat manager (used by
<a href="https://savage.nps.edu/X3dValidator">X3D&nbsp;Validator</a>
and other tools)
(TODO restrict to NPS intranet access?)
</li>
<li>
<a href="https://modelexchange.nps.edu">https://modelexchange.nps.edu</a>
......@@ -2371,6 +2356,56 @@ netbeans_jdkhome="C:\Program Files\Java\jdk1.8.0_221"</pre>
<!-- =========================================================== -->
<h2>
<!-- Unicode Character 'BOOKMARK' (U+1F516) https://www.fileformat.info/info/unicode/char/1f516/index.htm -->
<a href="#Tomcat">&#128278;</a>
<a name="Tomcat">Tomcat</a>
<a href="#">
<!-- width="83" height="100" -->
<img src="images/SavageLogo.png" width="42" height="50" border="0" title="to top" alt="to top" align="right"/>
</a>
</h2>
<p>
Apache Tomcat is an open-source implementation of the Java Servlet, JavaServer Pages, Java Expression Language and WebSocket technologies.
Tomcat provides a "pure Java" HTTP web server environment in which Java code can run.
</p>
<ul>
<li>
<a href="http://tomcat.apache.org" target="_blank">Apache Tomcat</a> official release site.
</li>
<li>
<a href="https://en.wikipedia.org/wiki/Apache_Tomcat" target="_blank">Wikipedia: Apache Tomcat</a>
provides an excellent summary of available capabilities.
</li>
<li>
Jason Brittain with Ian F. Darwin,
<a href="https://datacadamia.com/tomcat/logon" target="_blank">Tomcat: The Definitive Guide</a>,
2nd Edition, O'Reilly Media, 2008.
</li>
<li>
<a href="https://datacadamia.com/tomcat/logon" target="_blank">Datacadamia: how to log in</a> includes configuration guidance.
</li>
</ul>
<p>
Example information for <i>conf/tomcat-users.xml</i> configuration file follows.
Note that any username must also be configured in the Tomcat installation itself.
</p>
<pre style="background-color:lightgrey">
&lt;role rolename="admin"/&gt;
&lt;role rolename="admin-gui"/&gt;
&lt;role rolename="admin-script"/&gt;
&lt;role rolename="manager-gui"/&gt;
&lt;role rolename="manager-script"/&gt;
&lt;user username="moi" password="no-really" roles="admin,admin-gui,admin-script,manager-gui,manager-script" /&gt;
</pre>
<p>
Under Windows operating system, better results have been obtained when installing Tomcat as local user
rather than requiring administrator permissions.
</p>
<!-- =========================================================== -->
<h2>
<!-- Unicode Character 'BOOKMARK' (U+1F516) https://www.fileformat.info/info/unicode/char/1f516/index.htm -->
<a href="#Tools">&#128278;</a>
......@@ -2950,7 +2985,7 @@ which can lead to the Internet of Things becoming the Web of Things. </i>
<a href="https://savage.nps.edu/developers.html">https://savage.nps.edu/developers.html</a>
</blockquote>
<blockquote>
Revised 19 July 2020.
Revised 14 September 2020.
</blockquote>
<p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment