Rip-and-replace rxtx for jssc (#121)

* Initial commit of jssc->rxtx replacement * Don't forget the libs * Correct substitutions for jssc * Bug in length calc for page-aligned bootstrap downloads * Binary file transfer overhaul * Actually retry when we have a bad acknowledgement * Add logging jar for jssc, don't flush serial because it hurts * Update documentation for removal of rxtx, add github * Complain when serial port is in use * OSX-/// bootstrapping repair * Platform-independent serial buffer speed management * vsdrive doc updates * Prepare for 2.1.0 release * Remove adtpro.cmd * Line endings for Windohs * Just some spacing problems * Copyright date
ADTPro · Nov 26, 2020 · 229731e · 229731e
1 parent 990b062
commit 229731e
Show file tree

Hide file tree

Showing 56 changed files with 370 additions and 519 deletions.
diff --git a/.classpath b/.classpath
@@ -4,7 +4,8 @@
 	<classpathentry kind="src" path="src/client"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANT_JAR"/>
-	<classpathentry kind="lib" path="build/lib/rxtx/RXTXcomm.jar"/>
 	<classpathentry kind="lib" path="build/lib/AppleCommander/AppleCommander-1.3.5.13-ac.jar"/>
+	<classpathentry kind="lib" path="build/lib/jssc/jssc-2.9.2.jar"/>
+	<classpathentry kind="lib" path="build/lib/jssc/jssc-2.9.2-javadoc.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/build/BUILD.PROCESS b/build/BUILD.PROCESS
@@ -1,5 +1,5 @@
 For detailed build instructions, see:
-http://adtpro.com/developing.html
+https://adtpro.com/developing.html
 
 The ADTPro project is using the ca65 macro assembler from
 the cc65 project (http://www.cc65.org/).  The file

diff --git a/build/README b/build/README
@@ -8,16 +8,15 @@ The ADTPro distribution comes as a single file named
 something similar to ADTPro-v.r.m with an extension
 particular to the target platform:
 
-  * ADTPro-v.r.m.tar.gz - Linux or Solaris
+  * ADTPro-v.r.m.tar.gz - Linux
   * ADTPro-v.r.m.dmg - Mac OSX
-  * ADTPro-v.r.m.zip - Windows or OS/2
+  * ADTPro-v.r.m.zip - Windows
 
 Your distribution should contain most of these, depending on platform:
 
- * ADTPro-v.r.m.app       - OSX server application for OSX 10.3 through OSX 10.10
- * adtpro.command         - OSX server startup command file for OSX 10.11 and above
+ * ADTPro-v.r.m.app       - OSX server application
+ * adtpro.command         - OSX server startup command file
  * adtpro.bat             - Windows server startup batch file
- * adtpro.cmd             - OS/2 server startup batch file
  * adtpro.sh              - Linux/Solaris server startup
                             shell script
  * ac.sh                  - AppleCommander command line shell script invoker
@@ -41,7 +40,7 @@ Your distribution should contain most of these, depending on platform:
                             (Apple 800K disk images)
  * lib/ADTPro-v.r.m.jar   - ADTPro server-side software
                             (a Java .jar file)
- * lib/rxtx/...           - Java serial library files
+ * lib/jssc/...           - Java serial library files
  * lib/AppleCommander/AppleCommander-v.r.m.p-ac.jar
                           - AppleCommander support Jar
 
@@ -52,7 +51,7 @@ To get started, you will need a Java installation you can call
 from the host computer's command line. This means that if you type
 the command "java -version" from a terminal window it ought to
 produce output other than complaints. One place to get a downloadable
-Java distribution is from Sun Microsystems: Sun JRE download. When
+Java distribution is from Oracle JRE download. When
 you get there, look for a "Java Runtime Environment (JRE)" download
 for your platform and install it.
 
@@ -61,10 +60,9 @@ unpack it using your operating system's native facilities. You can
 either run the server startup program from the command line or, in
 Windows and OSX, double-click on the icon of the startup program:
 
-Linux, Solaris: adtpro.sh
-OS/2:           adtpro.cmd
-OSX:            ADTPro-v.r.m.app or adtpro.command
-Windows:        adtpro.bat
+Linux:   adtpro.sh
+OSX:     ADTPro-v.r.m.app or adtpro.command
+Windows: adtpro.bat
 
 You can modify the startup program to suit your environment.
 Especially for the Unix variants - it may need a little tweaking to
@@ -94,32 +92,3 @@ project's github issues tracker:
 https://github.com/ADTPro/adtpro/issues
 
 Good luck - and have fun!
-
-Unix RXTX Considerations
-------------------------
-
-The adtpro.sh file can be customized to suit your environment.
-The main thing to do is to choose your platform for RXTX support.
-You may need to tweak the check for what your operating system
-returns from the uname command, and connect that to the
-appropriate RXTX library directory.
-
-If you don't specify the right one, or if your platform is
-unsupported by RXTX, you will get an error similar to the one below
-on startup:
-
-java.lang.UnsatisfiedLinkError: Can't find library rxtxSerial
-  (librxtxSerial.so) in sun.boot.library.path or java.library.path
-sun.boot.library.path=/opt/IBMJava2-142/jre/bin
-java.library.path=/opt/IBMJava2-142/jre/bin:
- /opt/IBMJava2-142/jre/bin/classic:/opt/IBMJava2-142/jre/bin:/usr/lib
- thrown while loading gnu.io.RXTXCommDriver
-
-Keep working at your startup script or take a look at the RXTX install
-instructions in the rxtx directory. Remember, you can always ask for
-in a tracker:
-
-https://github.com/ADTPro/adtpro/issues
-
-RXTX binary build for 64-bit Windows provided as a courtesy of Cloudhopper.
-Please see http://rxtx.cloudhopper.net/ for more info.
diff --git a/build/adtprobase.bat b/build/adtprobase.bat
@@ -1,40 +1,24 @@
-@echo off
-REM
-REM ADTPro - Windows startup batch file
-REM
-REM Note:
-REM   Invoke with the name of the communications button to push
-REM   in order to start with that mode active (i.e. 'adtpro ethernet')
-
-SET ADTPRO_HOME=%CD%\
-
-REM You can set two variables here:
-REM   1. %JAVA_HOME% - to pick a particular java to run under
-REM   2. %ADTPRO_HOME% - to say where you installed ADTPro
-REM
-REM e.g. uncomment (remove the "REM" from in front of) and
-REM      customize the following SET statements.  
-REM Note: They must have a trailing backslash as in the examples!
-REM 
-REM SET ADTPRO_HOME=C:\src\workspace\35\adtpro\build\
-REM SET MY_JAVA_HOME=C:\Progra~1\IBM\Java142\bin\
-
-set RXTX_PATH=%RXTX_VERSION_OLD%
-set RXTX_ARCH=%RXTX_PATH%\Windows\i368-mingw32
-
-IF "%PROCESSOR_ARCHITECTURE%"=="x86" goto add_classpath
-
-:bit64
-REM Assume 64 bit Windows if not x86
-set RXTX_PATH=%RXTX_VERSION_WIN64%
-set RXTX_ARCH=%RXTX_PATH%
-
-:add_classpath
-SET CWD=%CD%
-if "%ADTPRO_CLASSPATH_SET%" == "1" goto start
-set ADTPRO_CLASSPATH_SET=1
-PATH=%PATH%;%ADTPRO_HOME%lib\rxtx\%RXTX_ARCH%
-
-:start
-CD "%ADTPRO_HOME%"
-start /min %MY_JAVA_HOME%java -Xms128m -Xmx256m %ADTPRO_EXTRA_JAVA_PARMS% -cp "%ADTPRO_HOME%lib\%ADTPRO_VERSION%";"%ADTPRO_HOME%lib\rxtx\%RXTX_PATH%\RXTXcomm.jar";"%ADTPRO_HOME%lib\AppleCommander\AppleCommander-%AC_VERSION%.jar" org.adtpro.ADTPro %*
+@echo off
+REM
+REM ADTPro - Windows startup batch file
+REM
+REM Note:
+REM   Invoke with the name of the communications button to push
+REM   in order to start with that mode active (i.e. 'adtpro ethernet')
+
+SET ADTPRO_HOME=%CD%\
+
+REM You can set two variables here:
+REM   1. %JAVA_HOME% - to pick a particular java to run under
+REM   2. %ADTPRO_HOME% - to say where you installed ADTPro
+REM
+REM e.g. uncomment (remove the "REM" from in front of) and
+REM      customize the following SET statements.  
+REM Note: They must have a trailing backslash as in the examples!
+REM 
+REM SET ADTPRO_HOME=C:\src\workspace\35\adtpro\build\
+REM SET MY_JAVA_HOME=C:\Progra~1\IBM\Java142\bin\
+
+:start
+CD "%ADTPRO_HOME%"
+start /min %MY_JAVA_HOME%java -Xms128m -Xmx256m %ADTPRO_EXTRA_JAVA_PARMS% -cp "%ADTPRO_HOME%lib\%ADTPRO_VERSION%";"%ADTPRO_HOME%lib\AppleCommander\AppleCommander-%AC_VERSION%.jar";"%ADTPRO_HOME%lib\jssc\jssc-%JSSC_VERSION%.jar";"%ADTPRO_HOME%lib\jssc\slf4j-nop-%SLF4J_VERSION%.jar" org.adtpro.ADTPro %*
diff --git a/build/adtprobase.cmd b/build/adtprobase.cmd
diff --git a/build/adtprobase.sh b/build/adtprobase.sh
@@ -26,40 +26,6 @@ export ADTPRO_HOME="`pwd`/"
 OS=`uname`
 OS_ARCH=`uname -p`
 
-# For Linux, use this:
-if [ "$OS" = "Linux" ]; then
-  if [ -f /usr/bin/raspi-config ]; then
-    export RXTXLIB=lib/rxtx/%RXTX_VERSION%/arm
-    ADTPRO_EXTRA_JAVA_PARMS="-Dgnu.io.rxtx.SerialPorts=/dev/ttyUSB0:/dev/ttyAMA0"
-  elif [ "$OS_ARCH" = "i686" ]; then
-    export RXTXLIB=lib/rxtx/%RXTX_VERSION%/i686-pc-linux-gnu
-  else
-    if [ "$OS_ARCH" = "i386" ]; then
-      export RXTXLIB=lib/rxtx/%RXTX_VERSION%/i686-pc-linux-gnu
-    else  
-      export RXTXLIB=lib/rxtx/%RXTX_VERSION%/x86_64-unknown-linux-gnu
-    fi
-  fi
-fi
-
-# For OSX, use this:
-if [ "$OS" = "Darwin" ]; then
-  if [ "$OS_ARCH" = "powerpc" ]; then
-    export RXTXLIB=lib/rxtx/%RXTX_VERSION_OLD%/Mac_OS_X
-  else
-    export RXTXLIB=lib/rxtx/%RXTX_VERSION%/mac-10.5
-  fi
-fi
-
-# For Solaris, use this:
-if [ "$OS" = "SunOS" ]; then
-  export RXTXLIB=lib/rxtx/%RXTX_VERSION%/sparc-sun-solaris2.10-32
-fi
-
-# Set up the library location.
-export TWEAK1="-Djava.library.path="
-export TWEAK="$TWEAK1""$ADTPRO_HOME""$RXTXLIB"
-
 if [ "$1x" = "headlessx" ]; then
   shift
   if [ "$1x" = "x" ] || [ ! -f /usr/bin/xvfb-run ]; then
@@ -74,4 +40,4 @@ if [ "$1x" = "headlessx" ]; then
   fi
 fi
 
-$HEADLESS"$MY_JAVA_HOME"java -Xms256m -Xmx512m "$TWEAK" $ADTPRO_EXTRA_JAVA_PARMS -cp "$ADTPRO_HOME"lib/%ADTPRO_VERSION%:"$ADTPRO_HOME""$RXTXLIB"/../RXTXcomm.jar:"$ADTPRO_HOME"lib/AppleCommander/AppleCommander-%AC_VERSION%.jar org.adtpro.ADTPro $*
+$HEADLESS"$MY_JAVA_HOME"java -Xms256m -Xmx512m -cp "$ADTPRO_HOME"lib/%ADTPRO_VERSION%:"$ADTPRO_HOME"lib/AppleCommander/AppleCommander-%AC_VERSION%.jar:"$ADTPRO_HOME"lib/jssc/jssc-%JSSC_VERSION%.jar:"$ADTPRO_HOME"lib/jssc/slf4j-nop-%SLF4J_VERSION%.jar org.adtpro.ADTPro $*
diff --git a/build/build.xml b/build/build.xml
@@ -50,7 +50,7 @@ all
 -->
 
 <project name="ADTPro" default="all" basedir="..">
-	<property name="versionString" value="v.r.m" />
+	<property name="versionString" value="2.1.0" />
 	<property name="projdir" value="${basedir}" />
 	<property name="srcdir" value="${basedir}/src" />
 	<property name="destdir" value="${basedir}/dest" />
@@ -72,13 +72,12 @@ all
 	<property name="acJarVersion" value="1.3.5.13-ac" />
 	<property name="acJarPath" value="${builddir}/lib/AppleCommander" />
 	<property name="acJar" value="AppleCommander-${acJarVersion}.jar" />
-	<property name="rxtxVersion" value="rxtx-2.2pre2-local" />
-	<property name="rxtxZip" value="${rxtxVersion}.zip" />
-	<property name="rxtxVersion2" value="rxtx-2.1-7-bins-r2" />
-	<property name="rxtxZip2" value="${rxtxVersion2}.zip" />
-	<property name="rxtxJar" value="${builddir}/lib/rxtx/RXTXcomm.jar" />
-	<property name="rxtxVersionCloudHopperWin64" value="ch-rxtx-2.2-20081207-win-x64" />
-	<property name="rxtxZipCHWin64" value="${rxtxVersionCloudHopperWin64}.zip" />
+	<property name="jsscVersion" value="2.9.2" />
+	<property name="jsscJar" value="jssc-${jsscVersion}.jar" />
+	<property name="jsscJarPath" value="${builddir}/lib/jssc" />
+	<property name="slf4jVersion" value="1.7.9" />
+	<property name="slf4jJar" value="slf4j-nop-${slf4jVersion}.jar" />
+	<property name="slf4jJarPath" value="${builddir}/lib/jssc" />
 	<property name="ip65lib" value="${builddir}/lib/ip65/ip65.lib ${builddir}/lib/ip65/a2combo.lib ${builddir}/lib/cc65/apple2.lib" />
 	<property name="ip65u2lib" value="${builddir}/lib/ip65/ip65.lib ${builddir}/lib/ip65/a2uther2.lib ${builddir}/lib/cc65/apple2.lib" />
 	<property name="dmgmegabytes" value="9" />
@@ -112,13 +111,9 @@ all
 		   includes="messages_it.native" ext=".properties" />
 		<native2ascii encoding="ISO-8859-1" src="${srcdir}/org/adtpro/resources" dest="${destdir}/org/adtpro/resources"
 		   includes="messages_pt_BR.native" ext=".properties" />
-		<unzip src="${builddir}/lib/rxtx/${rxtxZip}"
-			dest="${builddir}/${distName}/lib/rxtx"/>
-		<unzip src="${builddir}/lib/rxtx/${rxtxZip2}"
-			dest="${builddir}/${distName}/lib/rxtx"/>
-		<unzip src="${builddir}/lib/rxtx/${rxtxZipCHWin64}"
-			dest="${builddir}/${distName}/lib/rxtx"/>
 		<copy file="${acJarPath}/${acJar}" todir="${builddir}/${distName}/lib/AppleCommander" />
+		<copy file="${jsscJarPath}/${jsscJar}" todir="${builddir}/${distName}/lib/jssc" />
+		<copy file="${slf4jJarPath}/${slf4jJar}" todir="${builddir}/${distName}/lib/jssc" />
 		<copy file="${builddir}/README" todir="${builddir}/${distName}" />
 		<copy file="${builddir}/LICENSE" todir="${builddir}/${distName}" />
 		<copy file="${builddir}/ADTPro.html" todir="${builddir}/${distName}" />
@@ -136,7 +131,7 @@ all
 			includes="**/*.sh"/>
 	</target>
 	<target name="compile">
-		<javac srcdir="${srcdir}" destdir="${destdir}" classpath="${acJarPath}/${acJar}:${rxtxJar}" includeantruntime="false">
+		<javac srcdir="${srcdir}" destdir="${destdir}" classpath="${acJarPath}/${acJar}:${jsscJarPath}/${jsscJar}" includeantruntime="false">
 			<exclude name="org/adtpro/utilities/AppleDump.java" />
 		</javac>
 	</target>
@@ -167,7 +162,6 @@ all
 		<!-- Get rid of stuff the Apple crowd doesn't need -->
 		<move file="${builddir}/${distName}/ADTPro.sh" tofile="${builddir}/${distName}/ADTPro.command"/>
 		<delete file="${builddir}/${distName}/ADTPro.bat" />
-		<delete file="${builddir}/${distName}/ADTPro.cmd" />
 		<delete file="${builddir}/${distName}/ac.bat" />
 
 		<!-- Copy the app starter stub -->
@@ -192,22 +186,18 @@ all
 	</target>
 	<target name="scripts" description="Tailor Server Scripts" >
 		<copy file="${builddir}/adtprobase.bat" tofile="${builddir}/${distName}/adtpro.bat" />
-		<copy file="${builddir}/adtprobase.cmd" tofile="${builddir}/${distName}/adtpro.cmd" />
 		<copy file="${builddir}/adtprobase.sh" tofile="${builddir}/${distName}/adtpro.sh" />
 		<copy file="${builddir}/acbase.sh" tofile="${builddir}/${distName}/ac.sh" />
 		<copy file="${builddir}/acbase.bat" tofile="${builddir}/${distName}/ac.bat" />
 		<replace file="${builddir}/${distName}/adtpro.bat" token="%ADTPRO_VERSION%" value="${distName}.jar"/>
-		<replace file="${builddir}/${distName}/adtpro.bat" token="%RXTX_VERSION%" value="${rxtxVersion}"/>
-		<replace file="${builddir}/${distName}/adtpro.bat" token="%RXTX_VERSION_OLD%" value="${rxtxVersion2}"/>
-		<replace file="${builddir}/${distName}/adtpro.bat" token="%RXTX_VERSION_WIN64%" value="${rxtxVersionCloudHopperWin64}"/>
 		<replace file="${builddir}/${distName}/adtpro.bat" token="%AC_VERSION%" value="${acJarVersion}"/>
+		<replace file="${builddir}/${distName}/adtpro.bat" token="%JSSC_VERSION%" value="${jsscVersion}"/>
+		<replace file="${builddir}/${distName}/adtpro.bat" token="%SLF4J_VERSION%" value="${slf4jVersion}"/>
 		<replace file="${builddir}/${distName}/ac.bat" token="%AC_VERSION%" value="${acJarVersion}"/>
-		<replace file="${builddir}/${distName}/adtpro.cmd" token="%ADTPRO_VERSION%" value="${distName}.jar"/>
-		<replace file="${builddir}/${distName}/adtpro.cmd" token="%RXTX_VERSION%" value="${rxtxVersion}"/>
 		<replace file="${builddir}/${distName}/adtpro.sh" token="%ADTPRO_VERSION%" value="${distName}.jar"/>
-		<replace file="${builddir}/${distName}/adtpro.sh" token="%RXTX_VERSION%" value="${rxtxVersion}"/>
-		<replace file="${builddir}/${distName}/adtpro.sh" token="%RXTX_VERSION_OLD%" value="${rxtxVersion2}"/>
 		<replace file="${builddir}/${distName}/adtpro.sh" token="%AC_VERSION%" value="${acJarVersion}"/>
+		<replace file="${builddir}/${distName}/adtpro.sh" token="%JSSC_VERSION%" value="${jsscVersion}"/>
+		<replace file="${builddir}/${distName}/adtpro.sh" token="%SLF4J_VERSION%" value="${slf4jVersion}"/>
 		<replace file="${builddir}/${distName}/ac.sh" token="%AC_VERSION%" value="${acJarVersion}"/>
 	</target>
 

diff --git a/build/lib/jssc/.gitignore b/build/lib/jssc/.gitignore
@@ -0,0 +1 @@
+/doc/
diff --git a/build/lib/jssc/jssc-2.9.2-javadoc.jar b/build/lib/jssc/jssc-2.9.2-javadoc.jar
diff --git a/build/lib/jssc/jssc-2.9.2.jar b/build/lib/jssc/jssc-2.9.2.jar
diff --git a/build/lib/jssc/slf4j-nop-1.7.9.jar b/build/lib/jssc/slf4j-nop-1.7.9.jar
diff --git a/build/lib/rxtx/RXTXcomm.jar b/build/lib/rxtx/RXTXcomm.jar
diff --git a/build/lib/rxtx/ch-rxtx-2.2-20081207-win-x64.zip b/build/lib/rxtx/ch-rxtx-2.2-20081207-win-x64.zip
diff --git a/build/lib/rxtx/rxtx-2.1-7-bins-r2.zip b/build/lib/rxtx/rxtx-2.1-7-bins-r2.zip
diff --git a/build/lib/rxtx/rxtx-2.2pre2-local.zip b/build/lib/rxtx/rxtx-2.2pre2-local.zip
diff --git a/doc/buildit.bat b/doc/buildit.bat
@@ -6,7 +6,6 @@ call c:\dev\env
 rmdir /q /s target
 call mvn site
 cd target\site
-perl -i.orig -p ..\..\htmlpassthrough.re webring.html
 perl -i.orig -p ..\..\htmlpassthrough.re index.html
 perl -i.orig -p ..\..\htmlpassthrough.re bootstrap.html
 perl -i.orig -p ..\..\htmlpassthrough.re bootstrapaudio.html

diff --git a/doc/buildit.sh b/doc/buildit.sh
@@ -2,7 +2,6 @@
 rm -rf target
 mvn site
 cd target/site
-perl -i.orig -p ../../htmlpassthrough.re webring.html
 perl -i.orig -p ../../htmlpassthrough.re index.html
 perl -i.orig -p ../../htmlpassthrough.re bootstrap.html
 perl -i.orig -p ../../htmlpassthrough.re bootstrapaudio.html

diff --git a/doc/buildpost.bat b/doc/buildpost.bat
@@ -28,7 +28,6 @@ perl -i.orig -p ..\..\removeMaven.re receiving.html
 perl -i.orig -p ..\..\removeMaven.re sending.html
 perl -i.orig -p ..\..\removeMaven.re starting.html
 perl -i.orig -p ..\..\removeMaven.re translations.html
-perl -i.orig -p ..\..\removeMaven.re webring.html
 perl -i.orig -p ..\..\removeMaven.re vdrive.html
 erase *.orig
 cd ..\..
diff --git a/doc/buildpost.sh b/doc/buildpost.sh
@@ -28,6 +28,5 @@ perl -i.orig -p ../../removeMaven.re receiving.html
 perl -i.orig -p ../../removeMaven.re sending.html
 perl -i.orig -p ../../removeMaven.re starting.html
 perl -i.orig -p ../../removeMaven.re translations.html
-perl -i.orig -p ../../removeMaven.re webring.html
 perl -i.orig -p ../../removeMaven.re vdrive.html
 cd ../..
diff --git a/doc/htmlpassthrough.re b/doc/htmlpassthrough.re
@@ -1,4 +1,3 @@
-s@webringreplaced@<script type="text/javascript"src="http://ss.webring.com/navbar?f=j;y=schmidtd;u=adtpro"></script>Powered by <a href="http://dir.webring.com/rw" target=_top>WebRing</a>.@ig;
 s@youtubereplaced@<iframe width="560" height="315" src="https://www.youtube.com/embed/Gw1hfZ-Bc4g" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>@ig;
 s@youtubereplace2@<object width="425" height="350"><param name="movie" value="https://www.youtube.com/v/mmPrJCObjuo"></param><embed src="https://www.youtube.com/v/mmPrJCObjuo" type="application/x-shockwave-flash" width="425" height="350"></embed></object>@ig;
 s@youtubereplace3@<object width="425" height="344"><param name="movie" value="https://www.youtube.com/v/_PNDOR06NeU&color1=0xb1b1b1&color2=0xcfcfcf&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><embed src="https://www.youtube.com/v/_PNDOR06NeU&color1=0xb1b1b1&color2=0xcfcfcf&hl=en&fs=1" type="application/x-shockwave-flash" allowfullscreen="true" width="425" height="344"></embed></object>@ig;

diff --git a/doc/pom.xml b/doc/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.adtpro</groupId>
   <artifactId>doc</artifactId>
-  <version>2.0.3</version>
+  <version>2.1.0</version>
   <name>ADTPro</name>
   <url>https://adtpro.com</url>
   <inceptionYear>2006</inceptionYear>

diff --git a/doc/removeMaven.re b/doc/removeMaven.re
@@ -1,4 +1,4 @@
-s@v\.r\.m@2.0.3@ig;
+s@v\.r\.m@2.1.0@ig;
 s@\<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"\>@<a href="https://github.com/ADTPro/adtpro"><img src="https://assets-cdn.github.com/images/modules/logos_page/GitHub-Logo.png" /></a>@ig;
 s@\<img class="builtBy" alt="Built by Maven" src="\./images/logos/maven-feather.png" \/\>@@ig;
 s@\</body\>@\<script src\=\"http\:\/\/www.google-analytics.com\/urchin.js\" type\=\"text\/javascript\"\>\<\/script\>\<script type\=\"text\/javascript\"\>_uacct \= \"UA-697468-1\";urchinTracker\(\);\<\/script\>\<\/body\>@ig;
@@ -19,5 +19,4 @@ s@href="http://dreher.net/?s=projects/CFforAppleII&amp;c=projects/CFforAppleII/m
 s@href="http://www.callapple.org/uncategorized/announcing-prodos-2-4-for-all-apple-ii-computers/"@href="http://www.callapple.org/uncategorized/announcing-prodos-2-4-for-all-apple-ii-computers/" target\="_new"@ig;
 s@href="http://oliverschmidt.github.io/ip65/"@href="http://oliverschmidt.github.io/ip65/" target\="_new"@ig;
 s@href="hhttps://github.com/a2retrosystems/uthernet2/wiki/W5100-Shared-Access"@href="https://github.com/a2retrosystems/uthernet2/wiki/W5100-Shared-Access" target\="_new"@ig;
-s@webringreplaced@<script type="text/javascript"src="http://ss.webring.com/navbar?f=j;y=schmidtd;u=adtpro"></script>Powered by <a href="http://dir.webring.com/rw" target=_top>WebRing</a>.@ig;
 s@&amp;#223;@&#223;@ig;
diff --git a/doc/removeMavenOrig.re b/doc/removeMavenOrig.re
@@ -11,5 +11,4 @@ s@(href\=\"http://apple3.org)(.*)\"@\1\2" target\="_new"@ig;
 s@href="http://www.connectworld.net/cgi-bin/iec/05MCAOSerial.html"@href="http://www.connectworld.net/cgi-bin/iec/05MCAOSerial.html" target\="_new"@ig;
 s@href="http://seb.riot.org/appleII/aladt.sml"@href="http://seb.riot.org/appleII/aladt.sml" target\="_new"@ig;
 s@href="http://dreher.net/?s=projects/CFforAppleII&amp;c=projects/CFforAppleII/main.php"@href="http://dreher.net/?s=projects/CFforAppleII&amp;c=projects/CFforAppleII/main.php" target\="_new"@ig;
-s@webringreplaced@<script type="text/javascript"src="http://ss.webring.com/navbar?f=j;y=schmidtd;u=adtpro"></script>Powered by <a href="http://dir.webring.com/rw" target=_top>WebRing</a>.@ig;
 s@&amp;#223;@&#223;@ig;