Merge branch 'master' into rxtx-to-pjc

Directly committing to resolve the following conflicts between master and rxtx-to-pjc - java/src/jmri/jmrix/AbstractSerialConnectionConfig.java - nbproject/project.xml
JMRI · Jan 30, 2016 · 4849b8c · 4849b8c
2 parents f33fcfd + ab388e5
commit 4849b8c
Show file tree

Hide file tree

Showing 330 changed files with 3,307 additions and 2,215 deletions.
diff --git a/help/README b/help/README
@@ -8,5 +8,5 @@ See the COPYING file for license information.
 
 For more information on JMRI, see
 
-  http://jmri.sf.net
+  http://jmri.org
 
diff --git a/help/en/Acknowledgements.shtml b/help/en/Acknowledgements.shtml
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <!-- This page is created from the content (not formatting) -->
-<!-- of http://jmri.sf.net/community/index.html -->
+<!-- of http://jmri.org/community/index.html -->
 
 <html lang="en">
 <head>

diff --git a/help/en/README b/help/en/README
@@ -13,7 +13,7 @@ to copy when making a new file.
 
 For more information on maintaining the various metadata in the 
 help system, please see:
-<http://jmri.sourceforge.net/help/en/html/doc/Technical/Help.shtml>
+<http://jmri.org/help/en/html/doc/Technical/Help.shtml>
 
 The JHelpDev.xml file is a convenient project definition for
 JHelpDev (http:jhelpdev.sf.net), a tool for maintaining index,

diff --git a/help/en/html/apps/DecoderPro/FAQ.shtml b/help/en/html/apps/DecoderPro/FAQ.shtml
@@ -80,7 +80,7 @@ they're also available somewhere else.
 	<p>
 	Updates occur continuously between versions of the program.
 	As files are contributed, we make them available on our
-	<a href="http://jmri.sourceforge.net/xml/decoders">collected decoder definitions</a>
+	<a href="http://jmri.org/xml/decoders">collected decoder definitions</a>
 	web page. You can download them from there, but note that most
 	web browsers will not let you directly view them; you really
 	do have to download them.

diff --git a/help/en/html/apps/DecoderPro/FileUpdate.shtml b/help/en/html/apps/DecoderPro/FileUpdate.shtml
@@ -26,7 +26,7 @@ Many people have contributed decoder definition
 files to DecoderPro.  Between new releases, new files may 
 be created that you might want to use.  These can usually be
 found either on
-<a href="http://jmri.sf.net/xml/decoders/">the JMRI web site</a>
+<a href="http://jmri.org/xml/decoders/">the JMRI web site</a>
 or in the 
 <a href="https://groups.yahoo.com/neo/groups/jmriusers/files/">files area of the JMRI users Yahoo group</a> (log in to access).
 <p>

diff --git a/help/en/html/apps/DecoderPro/Install.shtml b/help/en/html/apps/DecoderPro/Install.shtml
@@ -45,15 +45,15 @@ downloads.  The steps to getting it working are:
 
 	<dt class="left">Download and install JMRI
 	</dt><dd class="first">The 
-	<a href="http://jmri.sourceforge.net/download/index.shtml">Download page</a>
+	<a href="http://jmri.org/download/index.shtml">Download page</a>
 	on the main JMRI web site
 	provides links to download various JMRI versions, along
 	with links to release notes, etc.
 	<p>
 	Note that there are different downloads for different types
 	of computers (Macintosh, Windows, etc), and the procedures for
 	installing JMRI differ. You'll find all that explained on the
-	<a href="http://jmri.sourceforge.net/download/index.shtml">Download page</a>.</p>
+	<a href="http://jmri.org/download/index.shtml">Download page</a>.</p>
 	</dd>
 
 	<dt class="left">Setup JMRI

diff --git a/help/en/html/apps/DecoderPro/XML.shtml b/help/en/html/apps/DecoderPro/XML.shtml
@@ -62,7 +62,7 @@ are also made available as files in Comma-Separated-Variable (CSV) format.
 
 The definitive version of the data is in XML files. These can be obtained from 
 any JMRI distribution, or via the web at
-<a href="http://jmri.sf.net/xml">http://jmri.sf.net/xml</a>.
+<a href="http://jmri.org/xml">http://jmri.org/xml</a>.
 
   <!--#include virtual="/Footer" -->
   </div> <!-- close #mainContent -->

diff --git a/help/en/html/apps/DecoderPro/index.shtml b/help/en/html/apps/DecoderPro/index.shtml
@@ -98,7 +98,7 @@ for more information on how to use DecoderPro.
 The JMRI project has compiled a lot of information about decoders from
 many manufacturers, which we make freely available in several forms.
 To learn more, see the
-<a href="http://jmri.sourceforge.net/xml/XSLT/">Decoder information page</a>.
+<a href="http://jmri.org/xml/XSLT/">Decoder information page</a>.
 
 <!--#include virtual="/Footer" -->
 </div><!-- closes #mainContent-->

diff --git a/help/en/html/apps/PanelPro/AdvIcons.shtml b/help/en/html/apps/PanelPro/AdvIcons.shtml
@@ -75,7 +75,7 @@ on how to set this code up by hand.
 	"ReporterIconExample.xml".
 	<p>
 	(It's also available 
-	<a href="http://jmri.sf.net/xml/samples/ReporterIconExample.xml">on the web</a>
+	<a href="http://jmri.org/xml/samples/ReporterIconExample.xml">on the web</a>
 	but many browsers will try to interpret it instead of showing you the 
 	text; your browser's "View Source" option might help with that)
 	<p>

diff --git a/help/en/html/apps/PanelPro/PanelPro.shtml b/help/en/html/apps/PanelPro/PanelPro.shtml
@@ -91,10 +91,10 @@ that describes how Panel Pro and Layout Editor can be used together.
 
 <p>
 Please see our
-<a href="http://jmri.sf.net/community/examples/Gallery.shtml">Gallery page</a>
+<a href="http://jmri.org/community/examples/Gallery.shtml">Gallery page</a>
 for examples of how model railroaders have used this on their own layouts.
 There's also an example of using PanelPro for
-<a href="http://jmri.sf.net/community/examples/Modules.shtml">modular layouts</a>.
+<a href="http://jmri.org/community/examples/Modules.shtml">modular layouts</a>.
 
 <p>
 Rodney Black's <a href="http://cats4ctc.org/">CATS</a>
@@ -118,7 +118,7 @@ You can use these tools to configure quite complicated panels for
 large layouts.  The example above is from 
 <a href="http://kc.pennsyrr.com/layouts/kulp/index.html">Nick Kulp's Cornwall Railroad</a>.
 There's a
-<a href="http://jmri.sourceforge.net/community/examples/Panels-Cornwall/Cornwall.html">page on the main web site</a>
+<a href="http://jmri.org/community/examples/Panels-Cornwall/Cornwall.html">page on the main web site</a>
 that describes this in detail.
 There's also a
 <a href="http://ownry.squarespace.com/blog/2011/4/7/ctc-dispatcher-panel-on-the-ownry.html?SSScrollPosition=0">page describing the panel</a> 

diff --git a/help/en/html/apps/PanelPro/Panels.shtml b/help/en/html/apps/PanelPro/Panels.shtml
@@ -45,7 +45,7 @@ These are meant to represent a lit/dark panel indicator.  A red circle represent
 
 <h3>Creating a panel</h3>
 (Nick Kulp presented a nice clinic on this topic during March 2004; his slides are 
-<A href="http://jmri.sourceforge.net/community/clinics/NickKulpMarch2004/index.html">available on the main JMRI web site</a>.
+<A href="http://jmri.org/community/clinics/NickKulpMarch2004/index.html">available on the main JMRI web site</a>.
 Dick Bronson has provided several animated introductions
 to PanelPro on
 <A HREF="http://www.rr-cirkits.com/Clinics/Clinics.html">his own web pages</a>.

diff --git a/help/en/html/apps/PanelPro/ShowPanel.shtml b/help/en/html/apps/PanelPro/ShowPanel.shtml
@@ -33,9 +33,9 @@ read it, print it, copy and paste into a file of another form, etc.
 
 <p>
 A large example of this is available as a 
-<a href="http://jmri.sourceforge.net/community/examples/SPShastaConfigFile.pdf">PDF file</a>.  This is the configuration information, including
+<a href="http://jmri.org/community/examples/SPShastaConfigFile.pdf">PDF file</a>.  This is the configuration information, including
 routes, Logix, etc, for the 
-<a href="http://jmri.sourceforge.net/community/examples/SPShasta.shtml">SP Shasta Route</a>
+<a href="http://jmri.org/community/examples/SPShasta.shtml">SP Shasta Route</a>
 layout.
 <p>
 To view your own panel file, just open it with a web browser.
@@ -59,7 +59,7 @@ have different requirements.  But there are two things you can try:
 	<p>
 	To do this, change the second line of the file to:
 	<code><pre>
-	&lt;?xml-stylesheet href="http://jmri.sourceforge.net/xml/XSLT/panelfile.xsl" type="text/xsl"?&gt;
+	&lt;?xml-stylesheet href="http://jmri.org/xml/XSLT/panelfile.xsl" type="text/xsl"?&gt;
 	</pre></code>
 	<li>
 	Put the stylesheet file in the same place as your panel file, and
@@ -68,7 +68,7 @@ have different requirements.  But there are two things you can try:
 	To do this, first find the "xml/XSLT/panelfile.xsl" file
 	in your JMRI distribution directory, or 
 	get the most recent version from JMRI by downloading
-	<a href="http://jmri.sourceforge.net/xml/XSLT/panelfile.xsl">this link</a>.
+	<a href="http://jmri.org/xml/XSLT/panelfile.xsl">this link</a>.
 	Put a copy of that file in the same directory as the panel file
 	you want to display.
 	Then change the second line of your panel file to:

diff --git a/help/en/html/apps/PanelPro/Sidebar b/help/en/html/apps/PanelPro/Sidebar
@@ -12,8 +12,8 @@
 <li><a href="../../../package/jmri/jmrit/display/PanelEditor.shtml">Panel Editor</a>
 <li><a href="../../../package/jmri/jmrit/display/LayoutEditor.shtml">Layout Editor</a>
 <li><a href="FAQ.shtml">FAQ</a>
-<li><a href="http://jmri.sf.net/community/examples/Gallery.shtml">User's Layouts</a>
-<li><a href="http://jmri.sf.net/community/examples/Modules.shtml">Modular Layout Example</a>
+<li><a href="http://jmri.org/community/examples/Gallery.shtml">User's Layouts</a>
+<li><a href="http://jmri.org/community/examples/Modules.shtml">Modular Layout Example</a>
 <li><a href="ShowPanel.shtml">Display a Panel File</a>
 <li><a href="AdvIcons.shtml">Advanced Icons</a>
 <li><a href="../../setup/index.shtml">JMRI Setup</a></li>

diff --git a/help/en/html/apps/Sidebar b/help/en/html/apps/Sidebar
@@ -105,9 +105,9 @@
 		<dt><h3 style="padding-left: 1em;">Supported Computers</h3></dt>
 		<dd> 
 		    <ul>
-        <li><a href="http://jmri.sourceforge.net/install/WindowsNew.shtml">Windows</a>
-        <li><a href="http://jmri.sourceforge.net/install/MacOSX.shtml">Mac OS X</a>
-        <li><a href="http://jmri.sourceforge.net/install/Linux.shtml">Linux</a>
+        <li><a href="http://jmri.org/install/WindowsNew.shtml">Windows</a>
+        <li><a href="http://jmri.org/install/MacOSX.shtml">Mac OS X</a>
+        <li><a href="http://jmri.org/install/Linux.shtml">Linux</a>
         <li><a href="../setup/index.shtml">JMRI Setup</a></li>
    		  </ul>
 		</dd>

diff --git a/help/en/html/doc/Technical/JUnit.shtml b/help/en/html/doc/Technical/JUnit.shtml
@@ -322,7 +322,7 @@ that need to happen before you test its operation, you also have to wait for tho
 </ul>
 <p>
 For example, if creating a thread based on
-<a href="http://jmri.sourceforge.net/JavaDoc/doc/jmri/jmrit/automat/AbstractAutomaton.html">AbstractAutomat</a>, 
+<a href="http://jmri.org/JavaDoc/doc/jmri/jmrit/automat/AbstractAutomaton.html">AbstractAutomat</a>, 
 you can check the start with:
 <pre><code>
     AbsractAutomat p = new MyThreadClass();<br/>

diff --git a/help/en/html/doc/Technical/JVMCapabilities.shtml b/help/en/html/doc/Technical/JVMCapabilities.shtml
@@ -132,11 +132,11 @@ information on <a href="https://www.java.com/en/download/help/sysreq.xml">Java v
 	<tbody>
 	<tr><th>JMRI</th>
 	<th>Java</th>
-	<th><a href="http://jmri.sourceforge.net/install/MacOSX.shtml#sysreq">OS X</a></th>
-	<th><a href="http://jmri.sourceforge.net/install/WindowsNew.shtml#sysreq">Windows</a></th>
-	<th><a href="http://jmri.sourceforge.net/install/Linux.shtml#sysreq">Linux</a></th>
-	<th><a href="http://jmri.sourceforge.net/install/Ubuntu.shtml#sysreq">Ubuntu</a></th>
-	<th><a href="http://jmri.sourceforge.net/install/Raspbian.shtml#sysreq">Raspbian</a></th>
+	<th><a href="http://jmri.org/install/MacOSX.shtml#sysreq">OS X</a></th>
+	<th><a href="http://jmri.org/install/WindowsNew.shtml#sysreq">Windows</a></th>
+	<th><a href="http://jmri.org/install/Linux.shtml#sysreq">Linux</a></th>
+	<th><a href="http://jmri.org/install/Ubuntu.shtml#sysreq">Ubuntu</a></th>
+	<th><a href="http://jmri.org/install/Raspbian.shtml#sysreq">Raspbian</a></th>
 	</tr>
 	<tr><td>4.2</td>
 	<td>1.8</td>

diff --git a/help/en/html/doc/Technical/Jython.shtml b/help/en/html/doc/Technical/Jython.shtml
@@ -313,12 +313,12 @@ command from the menu.
 <H2>Using Python for signal logic and automation</h2>
 
 The existing JMRI 
-"<A HREF="http://jmri.sourceforge.net/JavaDoc/doc/jmri/jmrit/automat/package-summary.html">Automat</a>"
+"<A HREF="http://jmri.org/JavaDoc/doc/jmri/jmrit/automat/package-summary.html">Automat</a>"
 classes provide hooks for user layout automation, including signaling.
 But they require that you write Java code and compile it into .class files.
 <P>
 The 
-<A HREF="http://jmri.sourceforge.net/JavaDoc/doc/jmri/jmrit/automat/JythonAutomaton.html">JythonAutomaton</a>
+<A HREF="http://jmri.org/JavaDoc/doc/jmri/jmrit/automat/JythonAutomaton.html">JythonAutomaton</a>
 class is intended to make it easier to code custom layout automation, as
 it will allow you to invoke a Jython script.  Once it's integrated into
 the configuration process, you'll be able to code your automation in one

diff --git a/help/en/html/doc/Technical/XmlDtdUsage.shtml b/help/en/html/doc/Technical/XmlDtdUsage.shtml
@@ -56,7 +56,7 @@ In practice, this allows two forms for the DOCTYPE line:
 Early XML files used both; the program itself could generate
 either depending on the circumstances.
 <li>JMRI 1.9.2 and later provide a more powerful DTD search procedure using the 
-<a href="http://jmri.sourceforge.net/JavaDoc/doc/jmri/util/JmriLocalEntityResolver.html">jmri.util.JmriLocalEntityResolver</a>
+<a href="http://jmri.org/JavaDoc/doc/jmri/util/JmriLocalEntityResolver.html">jmri.util.JmriLocalEntityResolver</a>
 class. It parses the
 reference in the DOCTYPE and handles it in several ways:
     <ul>

diff --git a/help/en/html/doc/Technical/XmlPersistance.shtml b/help/en/html/doc/Technical/XmlPersistance.shtml
@@ -121,9 +121,9 @@ modified.
 <p>
 Note that in some cases, there's an inheritance relationship amoung the
 persisting classes that can help.  For example, the LocoNet 
-<a href="http://jmri.sourceforge.net/JavaDoc/doc/jmri/jmrix/loconet/configurexml/LnSensorManagerXml.html">LnSensorManagerXml</a>
+<a href="http://jmri.org/JavaDoc/doc/jmri/jmrix/loconet/configurexml/LnSensorManagerXml.html">LnSensorManagerXml</a>
 class inherits from 
-<a href="http://jmri.sourceforge.net/JavaDoc/doc/jmri/configurexml/AbstractTurnoutManagerConfigXML.html">jmri.configurexml.AbstractSensorManagerConfigXML</a>, which does
+<a href="http://jmri.org/JavaDoc/doc/jmri/configurexml/AbstractTurnoutManagerConfigXML.html">jmri.configurexml.AbstractSensorManagerConfigXML</a>, which does
 almost all the work of storing and loading sensors.
 
 <p>
@@ -140,7 +140,7 @@ JMRI controls XML semantics using
 For example, layout information is stored in XML files as
 a "layout-config" element, whose contents are then defined via a
 schema file.  These files are kept in the 
-<a href="http://jmri.sf.net/xml/schema">xml/schema</a>
+<a href="http://jmri.org/xml/schema">xml/schema</a>
 directory.
 
 

diff --git a/help/en/html/doc/Technical/XmlView.shtml b/help/en/html/doc/Technical/XmlView.shtml
@@ -28,7 +28,7 @@ files can be displayed in a web browser.  A technique called
 "XSLT stylesheets"
 is used to format them within the web browser.  
 For an example of how this looks, please see the 
-<a href="http://jmri.sourceforge.net/xml/samples/NicksClinic.xml">sample panel XML file</a> on the main JMRI
+<a href="http://jmri.org/xml/samples/NicksClinic.xml">sample panel XML file</a> on the main JMRI
 web site. (May take a few seconds to load)
 
 <p>

diff --git a/help/en/html/doc/Technical/index.shtml b/help/en/html/doc/Technical/index.shtml
@@ -201,7 +201,7 @@ unlimited-duration license to
 redistribute it consistent with the 
 <a href="#use">JMRI licensing</a>. 
 (We regret this paperwork, but
-<a href="http://jmri.sourceforge.net/k/copycomparison.html">Matt Katzer's misuse of copyright</a>
+<a href="http://jmri.org/k/copycomparison.html">Matt Katzer's misuse of copyright</a>
 makes it necessary).
 If other people also
 helped with the contribution, please let us know so

diff --git a/help/en/html/hardware/SRCP/index.shtml b/help/en/html/hardware/SRCP/index.shtml
@@ -43,7 +43,7 @@ JMRI Throttles via SRCP.
 
 <a name="limitations"></a><h2>Limitations</h2>
 <p>
-SRCP support was introduced in <a href="http://jmri.sf.net/releasenotes/jmri2.1.6.shtml">JMRI v2.1.6</a> during the Spring of 2008.  
+SRCP support was introduced in <a href="http://jmri.org/releasenotes/jmri2.1.6.shtml">JMRI v2.1.6</a> during the Spring of 2008.  
 That first version had several limitations:
 <ul>
 <li>It did not support "service mode" for configuring decoders, e.g. setting CVs.

diff --git a/help/en/html/hardware/ecos/index.shtml b/help/en/html/hardware/ecos/index.shtml
@@ -23,10 +23,10 @@
 <h3>Command Station</h3>
 <p>JMRI can connect to an ESU ECoS command station 
 via an Internet connection.</p>
-Support for ECoS was first available in <a href="http://jmri.sf.net/releasenotes/jmri2.3.3.shtml">JMRI 2.3.3</a>.<br>
-Support for the ECoS Throttle was first available in <a href="http://jmri.sf.net/releasenotes/jmri2.7.4.shtml">JMRI 2.7.4</a>.<br>
-Support for the ECoS s88 Feedback Sensors was first available in <a href="http://jmri.sf.net/releasenotes/jmri2.7.9.shtml">JMRI 2.7.9</a>.<br />
-Support for the ECoS RailCom Feedback was first available in <a href="http://jmri.sf.net/releasenotes/jmri2.99.7.shtml">JMRI 2.99.7</a>.    
+Support for ECoS was first available in <a href="http://jmri.org/releasenotes/jmri2.3.3.shtml">JMRI 2.3.3</a>.<br>
+Support for the ECoS Throttle was first available in <a href="http://jmri.org/releasenotes/jmri2.7.4.shtml">JMRI 2.7.4</a>.<br>
+Support for the ECoS s88 Feedback Sensors was first available in <a href="http://jmri.org/releasenotes/jmri2.7.9.shtml">JMRI 2.7.9</a>.<br />
+Support for the ECoS RailCom Feedback was first available in <a href="http://jmri.org/releasenotes/jmri2.99.7.shtml">JMRI 2.99.7</a>.    
 
 <a name="limitations"></a><h2>Limitations</h2>
 <p>Programming is supported by the Ecos from firmware version 4.1. However this goes only for the programming track. Programming on main is only available directly on the ECOS. Additional information on the ECoS can be found

diff --git a/help/en/html/hardware/loconet/LbServer.shtml b/help/en/html/hardware/loconet/LbServer.shtml
@@ -44,7 +44,7 @@ Configure the JMRI Client computers to connect to the LbServer as follows:
 	<li>In the "Server hostname" box that appears, type the Internet name
 	or address of the computer that's running the LbServer.
 	An internet address is something like 127.0.1.12; a name is something
-	like jmri.sf.net
+	like jmri.org
 	<li>In the "TCP Port Number" box enter the port number that LbServer is using, which by default is 1234. 
 	<li>Save the preferences and restart the program.
 </ul>