Various Updates

.classpath

@@ -8,7 +8,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANT_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.4.jar"/>
+	<classpathentry kind="lib" path="build/lib/AppleCommander/AppleCommander-ant-1.9.0.jar"/>
+	<classpathentry kind="lib" path="build/lib/jssc/jssc-2.10.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.gitignore

@@ -5,4 +5,5 @@ ADTProTrace.txt
 dest/
 tasks/
 /bin/
+/*.patch
 .DS_Store

build/.gitignore

@@ -1,10 +1,7 @@
 *.dsk
 *.po
 *.hdv
-ADTPro-*.zip
-ADTPro-*.jar
-ADTPro-*.tar
-ADTPro-*.gz
+ADTPro-*
 ADT
 ADTPRO
 ADTPROAUD

build/README

@@ -41,7 +41,7 @@ Your distribution should contain most of these, depending on platform:
  * lib/ADTPro-v.r.m.jar   - ADTPro server-side software
                             (a Java .jar file)
  * lib/jssc/...           - Java serial library files
- * lib/AppleCommander/AppleCommander-v.r.m.p-ac.jar
+ * lib/AppleCommander/AppleCommander-ant-v.r.m.jar
                           - AppleCommander support Jar
 
 In all cases above, v.r.m is replaced with the version, release 

build/acbase.bat

@@ -16,4 +16,4 @@ REM
 REM SET ADTPRO_HOME=C:\src\workspace\35\adtpro\build\
 REM SET MY_JAVA_HOME=C:\Progra~1\IBM\Java142\bin\
 
-%MY_JAVA_HOME%java -Xms128m -Xmx256m -jar "%ADTPRO_HOME%lib\AppleCommander\AppleCommander-%AC_VERSION%.jar" %*
+%MY_JAVA_HOME%java -Xms128m -Xmx256m -jar "%ADTPRO_HOME%lib\AppleCommander\AppleCommander-ant-%AC_VERSION%.jar" %*

build/acbase.sh

@@ -21,4 +21,4 @@ export ADTPRO_HOME=`pwd`
 # export MY_JAVA_HOME=/usr/local/java/bin/
 # export ADTPRO_HOME=~/myuser/adtpro
 
-"$MY_JAVA_HOME"java -Xms256m -Xmx512m -jar lib/AppleCommander/AppleCommander-%AC_VERSION%.jar $*
+"$MY_JAVA_HOME"java -Xms256m -Xmx512m -jar lib/AppleCommander/AppleCommander-ant-%AC_VERSION%.jar $*

build/adtprobase.bat

@@ -21,4 +21,4 @@ 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 %*
+start /min %MY_JAVA_HOME%java -Xms128m -Xmx256m %ADTPRO_EXTRA_JAVA_PARMS% -cp "%ADTPRO_HOME%lib\%ADTPRO_VERSION%";"%ADTPRO_HOME%lib\AppleCommander\AppleCommander-ant-%AC_VERSION%.jar";"%ADTPRO_HOME%lib\jssc\jssc-%JSSC_VERSION%.jar";"%ADTPRO_HOME%lib\jssc\slf4j-nop-%SLF4J_VERSION%.jar" org.adtpro.ADTPro %*

build/adtprobase.sh

@@ -40,4 +40,4 @@ if [ "$1x" = "headlessx" ]; then
   fi
 fi
 
-$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 $*
+$HEADLESS"$MY_JAVA_HOME"java -Xms256m -Xmx512m -cp "$ADTPRO_HOME"lib/%ADTPRO_VERSION%:"$ADTPRO_HOME"lib/AppleCommander/AppleCommander-ant-%AC_VERSION%.jar:"$ADTPRO_HOME"lib/jssc/jssc-%JSSC_VERSION%.jar:"$ADTPRO_HOME"lib/jssc/slf4j-nop-%SLF4J_VERSION%.jar org.adtpro.ADTPro $*

build/build.xml

@@ -30,6 +30,8 @@ all
 					vdrive-image-prep
 				prodos-vedrive
 					vdrive-image-prep
+				prodos-vedrive2
+					vdrive-image-prep
 			sos
 				sos-serial
 					sos-image-prep
@@ -50,12 +52,14 @@ all
 -->
 
 <project name="ADTPro" default="all" basedir="..">
-	<property name="versionString" value="v.r.m" />
 	<property name="projdir" value="${basedir}" />
 	<property name="srcdir" value="${basedir}/src" />
 	<property name="destdir" value="${basedir}/dest" />
 	<property name="tasks" value="${basedir}/tasks" />
 	<property name="builddir" value="${basedir}/build" />
+	<property file="${builddir}/ADTProBuild.properties"/>
+	<property file="${builddir}/ADTProBuild-default.properties"/>
+	<property name="versionString" value="v.r.m" />
 	<property name="distName" value="ADTPro-${versionString}" />
 	<property name="diskName" value="ADTPRO-${versionString}" />
 	<property name="disk3Name" value="ADTPROSOS-${versionString}" />
@@ -67,15 +71,13 @@ all
 	<property name="vdriveVolName" value="VDrive.${versionString}" />
 	<property name="vdriveVolName1" value="Hosted.VDrive1" />
 	<property name="vdriveVolName2" value="Hosted.VDrive2" />
-	<property file="${builddir}/ADTProBuild.properties"/>
-	<property file="${builddir}/ADTProBuild-default.properties"/>
-	<property name="acJarVersion" value="ant-1.8.0-SNAPSHOT" />
+	<property name="acVersion" value="1.9.0" />
+	<property name="acJar" value="AppleCommander-ant-${acVersion}.jar" />
 	<property name="acJarPath" value="${builddir}/lib/AppleCommander" />
-	<property name="acJar" value="AppleCommander-${acJarVersion}.jar" />
-	<property name="jsscVersion" value="2.9.4" />
+	<property name="jsscVersion" value="2.10.2" />
 	<property name="jsscJar" value="jssc-${jsscVersion}.jar" />
 	<property name="jsscJarPath" value="${builddir}/lib/jssc" />
-	<property name="slf4jVersion" value="1.7.36" />
+	<property name="slf4jVersion" value="2.0.17" />
 	<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" />
@@ -207,7 +209,7 @@ all
 	ProDOS section
 	============================================================================================
 	-->
-	<target name="prodos" depends="prepare,prodos-serial, prodos-audio, prodos-ethernet, prodos-bootstrap, prodos-vsdrive, prodos-vedrive" description="Orchestrate Overall Client Build for ProDOS" >
+	<target name="prodos" depends="prepare,prodos-serial, prodos-audio, prodos-ethernet, prodos-bootstrap, prodos-vsdrive, prodos-vedrive, prodos-vedrive2" description="Orchestrate Overall Client Build for ProDOS" >
 	</target>
 
 	<target name="prodos-serial" depends="tasks,prodos-adtpro-image-prep, common" description="Build the ADTPro Serial Client (ProDOS)">
@@ -377,10 +379,10 @@ all
 		<appleCommander command="pro800" imagename="${builddir}/${distName}/disks/Virtual2.po" volname="${vdriveVolName2}"/>
 		<echo message="Assembling ProDOS virtual Uthernet II drive source..."/>
 		<exec dir="${projdir}/src/client" executable="${assemblerPath}/ca65" failonerror="true">
-			<arg line="-t none -I . -l prodos/ethernet/drive2/vuiidrive_low.lst prodos/ethernet/drive2/vuiidrive_low.asm" />
+			<arg line="-t none -I . -I ${builddir}/lib -l prodos/ethernet/drive2/vuiidrive_low.lst prodos/ethernet/drive2/vuiidrive_low.asm" />
 		</exec>
 		<exec dir="${projdir}/src/client" executable="${assemblerPath}/ca65" failonerror="true">
-			<arg line="-t none -I . -l prodos/ethernet/drive2/vuiidrive_high.lst prodos/ethernet/drive2/vuiidrive_high.asm" />
+			<arg line="-t none -I . -I ${builddir}/lib -l prodos/ethernet/drive2/vuiidrive_high.lst prodos/ethernet/drive2/vuiidrive_high.asm" />
 		</exec>
 		<echo message="Linking Uthernet II drive..."/>
 		<exec dir="${projdir}/src/client" executable="${assemblerPath}/ld65" failonerror="true">
@@ -389,8 +391,6 @@ all
 		<exec dir="${projdir}/src/client" executable="${assemblerPath}/ld65" failonerror="true">
 			<arg line="-o VEDRIVE2H -m vuiidrive.map -C prodos/ethernet/drive2/vuiidrive.cfg prodos/ethernet/drive2/vuiidrive_high.o ${ip65lib}" />
 		</exec>
-		<move file="${projdir}/src/client/VEDRIVE2L" tofile="${projdir}/src/client/VEDRIVE2L" />
-		<move file="${projdir}/src/client/VEDRIVE2H" tofile="${projdir}/src/client/VEDRIVE2H" />
 		<echo message="Adding VEDrive2 to 5.25 disk image..."/>
 		<appleCommander command="d" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="VEDRIVE2L" failonerror="false"/>
 		<appleCommander command="d" imagename="${builddir}/${distName}/disks/${vdriveDiskName}.DSK" filename="VEDRIVE2H" failonerror="false"/>

build/lib/ip65/inc/ip65.h

@@ -8,8 +8,6 @@
 //
 #if defined(__APPLE2__)
 #define ETH_INIT_DEFAULT 3  // Apple II slot number
-#elif defined(__ATARI__)
-#define ETH_INIT_DEFAULT 8  // ATARI PBI device ID
 #else
 #define ETH_INIT_DEFAULT 0  // Unused
 #endif
@@ -294,16 +292,18 @@ bool __fastcall__ tftp_upload_from_memory(uint32_t server, const char* name,
 //
 // On success the variables url_ip, url_port and url_selector (see below) are valid.
 //
-// Inputs: url: Zero (or ctrl char) terminated string containing the URL
+// Inputs: url:     Zero (or ctrl char) terminated string containing the URL
+//         resolve: Resolve host in URL
 // Output: true if an error occured, false otherwise
 //
-bool __fastcall__ url_parse(const char* url);
+bool __fastcall__ url_parse(const char* url, bool resolve);
 
 // Access to parsed HTTP URL
 //
-// Access to the three items below is only valid after url_parse returned false.
+// Access to the four items below is only valid after url_parse returned false.
 //
-extern uint32_t url_ip;         // IP address of host in URL
+extern char*    url_host;       // Zero terminated string containing host in URL + "\r\n\r\n"
+extern uint32_t url_ip;         // IP address of host in URL (only if 'resolve' is true)
 extern uint16_t url_port;       // Port number of URL
 extern char*    url_selector;   // Zero terminated string containing selector part of URL
 

src/client/prodos/ethernet/drive2/initheavystack.asm

@@ -8,44 +8,36 @@
 ; Free Software Foundation; either version 2 of the License, or (at your 
 ; option) any later version.
 ;
-; This program is distributed in the hope that it will be useful, but 
-; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 
-; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 
+; This program is distributed in the hope that it will be useful, but
+; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
 ; for more details.
 ;
-; You should have received a copy of the GNU General Public License along 
-; with this program; if not, write to the Free Software Foundation, Inc., 
+; You should have received a copy of the GNU General Public License along
+; with this program; if not, write to the Free Software Foundation, Inc.,
 ; 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ;
 
-.import eth_driver_io_base	; Used to distinguish between Uthernet II and everything else
-.import eth_driver_name		; Used to distinguish between Uthernet II and everything else
-
 .import ip65_init
 .import dhcp_init
-.import a2_set_slot
+.import _w5100_name
 
 init_entry:
-	ldx #$07	; Start looking for a slot from the top
+	ldx #$07		; Start looking for a slot from the top
 	stx TEMPSLOT
 another:
-	dec TEMPSLOT	; Decrement first, as we are zero-indexing
+	dec TEMPSLOT		; Decrement first, as we are zero-indexing
 	bmi nonefound
 	jsr INITETHERNET
-	bcs another	; Not found?  Branch around for another
+	bcs another		; Not found?  Branch around for another
 found:
 	lda TEMPSLOT
 	clc
 	adc #$b0
 	sta $0400
-	lda eth_driver_io_base	; Check for Uthernet II-ness
-	and #$0f
-	cmp #$04
-	bne notUII		; Nope, not a II, but still valid
-	lda eth_driver_name+$0a	; Another check
+	lda _w5100_name+$0a	; Check for Uthernet II (byte 'I')
 	cmp #$49
-	beq isUthernetII	; Yep, found one!
-notUII:
+	beq isUthernetII	; Uthernet II detected
 	sec
 	rts
 
@@ -57,40 +49,36 @@ nonefound:
 
 isUthernetII:
 	sta $402
-	; Load up the W5100 driver
-	; Need to copy w5100init.asm(hdr) to w5100io.asm(hdr_from_init) (8 bytes) 
-	;   before moving the code up to driver space
-	; Set up vectors, etc. - common with ip65 code at this point, maybe
+	; Load up the W5100 driver (handled by uthernet2.s)
 	clc
 	rts
 
 ;---------------------------------------------------------
 ; INITETHERNET - Attempt to initialize the Ethernet card in TEMPSLOT
-; Returns with carry clear on success, carry set on failure 
+; Returns with carry clear on success, carry set on failure
 ;---------------------------------------------------------
 INITETHERNET:
-	GO_SLOW				; Slow down for SOS
+	GO_SLOW			; Slow down for SOS
 	ldx TEMPSLOT
 	inx
-	txa
-	jsr a2_set_slot
+	txa			; Slot number (1-7) in A for ip65_init
 	jsr ip65_init
 	bcc @UTHEROK
-	GO_FAST				; Speed back up for SOS
+	GO_FAST			; Speed back up for SOS
 	sec
 	rts
 @UTHEROK:
 	jsr dhcp_init
 	bcc @UTHEROK2
-	GO_FAST				; Speed back up for SOS
+	GO_FAST			; Speed back up for SOS
 	sec
 	rts
 @UTHEROK2:
-	GO_FAST				; Speed back up for SOS
+	GO_FAST			; Speed back up for SOS
 	lda TEMPSLOT
 	sta COMMSLOT
 	clc
 	rts
 
 TEMPSLOT:
-	.res 1
+	.res 1

src/org/adtpro/gui/AudioConfig.java

@@ -130,10 +130,12 @@ private AudioConfig(ADTProperties properties)
         */
       }
     }
-/*
-    Log.println(true, Messages.getString("Gui.NoAudio")); //$NON-NLS-1$
-    Log.println(false, "AudioConfig Constructor could not instantiate the rxtx library.");
-*/
+
+    if (comboAudioDevice.getItemCount() <= 1) // only default mixer present
+    {
+      Log.println(true, Messages.getString("Gui.NoAudio"));
+      Log.println(false, "AudioConfig Constructor could not initialize audio devices.");
+    }
     labelAudioDevice = new JLabel(Messages.getString("Gui.AudioConfigMixer"), SwingConstants.LEFT); //$NON-NLS-1$
 
     GridBagUtil.constrain(configPanel, labelAudioDevice, 1, 1, // X, Y Coordinates

src/org/adtpro/gui/Gui.java

@@ -21,6 +21,7 @@
 package org.adtpro.gui;
 
 import java.awt.BorderLayout;
+import java.awt.Desktop;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -32,6 +33,7 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.net.URI;
 import java.util.Arrays;
 import java.util.Properties;
 
@@ -43,7 +45,6 @@
 import org.adtpro.transport.SerialTransport;
 import org.adtpro.transport.SerialIPTransport;
 import org.adtpro.transport.UDPTransport;
-import org.adtpro.utilities.BareBonesBrowserLaunch;
 import org.adtpro.utilities.Log;
 import org.adtpro.utilities.StringUtilities;
 import org.adtpro.ADTProperties;
@@ -401,7 +402,7 @@ public void actionPerformed(ActionEvent e)
 			}
 			else
 			{
-				JOptionPane.showMessageDialog(this, Messages.getString("Gui.NoRXTXDialogText"), Messages.getString("Gui.NoRXTXDialogTitle"), JOptionPane.OK_OPTION);
+				JOptionPane.showMessageDialog(this, Messages.getString("Gui.NoSerialLibDialogText"), Messages.getString("Gui.NoSerialLibDialogTitle"), JOptionPane.OK_OPTION);
 				_disconnectButton.doClick();
 			}
 		}
@@ -703,7 +704,14 @@ else if (e.getActionCommand().equals(Messages.getString("Gui.About"))) //$NON-NL
 			}
 			else if (e.getActionCommand().equals(Messages.getString("Gui.Website"))) //$NON-NLS-1$
 			{
-				BareBonesBrowserLaunch.openURL("http://adtpro.com");
+				try
+				{
+					Desktop.getDesktop().browse(new URI("http://adtpro.com"));
+				}
+				catch (Exception ex)
+				{
+					ex.printStackTrace();
+				}
 			}
 			else if (e.getActionCommand().equals(Messages.getString("Gui.CD"))) //$NON-NLS-1$
 			{

src/org/adtpro/gui/SerialConfig.java

@@ -299,8 +299,8 @@ public void actionPerformed(ActionEvent e)
       else
       {
         // Hrm - can't find any serial stuff at all.
-        JOptionPane.showMessageDialog(this, Messages.getString("Gui.NoRXTXDialogText"),
-            Messages.getString("Gui.NoRXTXDialogTitle"), JOptionPane.OK_OPTION);
+        JOptionPane.showMessageDialog(this, Messages.getString("Gui.NoSerialLibDialogText"),
+            Messages.getString("Gui.NoSerialLibDialogTitle"), JOptionPane.OK_OPTION);
         _parent.setSerialAvailable(false);
       }
       _properties.setProperty("CommPortSpeed", (String) comboSpeed.getSelectedItem());

src/org/adtpro/resources/messagesOrig.properties

@@ -49,9 +49,9 @@ Gui.NoAudio=There are no audio devices available to Java on this machine.
 Gui.NoAudioDialogTitle=No Audio Devices
 Gui.NoAudioDialogText=<html>There are no audio devices available to Java on this machine.</html>
 Gui.DefaultAudioMixer=ADTPro Default Audio Capture
-Gui.NoRXTX=Serial library not installed.
-Gui.NoRXTXDialogTitle=No Serial Ports
-Gui.NoRXTXDialogText=<html>There are no serial ports, or the serial library RXTX is not installed or visible.<br>Please see http://adtpro.com/install.html for details.</html>
+Gui.NoSerialLib=Serial library not installed.
+Gui.NoSerialLibDialogTitle=No Serial Ports
+Gui.NoSerialLibDialogText=<html>There are no serial ports, or the serial library is not installed or visible.<br>Please see http://adtpro.com/install.html for details.</html>
 Gui.File=File
 Gui.Config=Configuration
 Gui.IIc=Apple IIc w/Imagewriter Cable

src/org/adtpro/resources/messages_es.native

@@ -35,9 +35,9 @@ Gui.NoAudio=Java no tiene dispositivos de audio disponibles en este equipo.
 Gui.NoAudioDialogTitle=No hay dispositivos de audio
 Gui.NoAudioDialogText=<html>Java no tiene dispositivos de audio disponibles en este equipo.</html>
 Gui.DefaultAudioMixer=ADTPro Captura de audio por defecto
-Gui.NoRXTX=La librer�a serie no est� instalada.
-Gui.NoRXTXDialogTitle=No hay puertos serie
-Gui.NoRXTXDialogText=<html>No hay puertos serie, o la librer�a serie RXTX no est� instalada o visible.<br>Por favor recurra a http://adtpro.com/install.html para m�s detalles.</html>
+Gui.NoSerialLib=La librer�a serie no est� instalada.
+Gui.NoSerialLibDialogTitle=No hay puertos serie
+Gui.NoSerialLibDialogText=<html>No hay puertos serie, o la librer�a serie no est� instalada o visible.<br>Por favor recurra a http://adtpro.com/install.html para m�s detalles.</html>
 Gui.File=Archivo
 Gui.Config=Configuraci�n
 Gui.IIc=Apple IIc con cable Imagewriter

src/org/adtpro/resources/messages_fr.native

@@ -36,9 +36,9 @@ Gui.NoAudio=Il n'y a pas de p
 Gui.NoAudioDialogTitle=Aucun p�riph�rique audio
 Gui.NoAudioDialogText=<html>Il n'y a pas de p�riph�rique audio pour Java sur cette machine.</html>
 Gui.DefaultAudioMixer=Capture audio ADTPro par d�faut
-Gui.NoRXTX=Biblioth�que s�rie non install�e.
-Gui.NoRXTXDialogTitle=Aucun port s�rie
-Gui.NoRXTXDialogText=<html>Il n'y a pas de port s�rie, ou la biblioth�que s�rie RXTX n'est pas install�e ou n'est pas visible.<br>Veuillez aller sur http://adtpro.com/install.html pour de plus amples renseignements.</html>
+Gui.NoSerialLib=Biblioth�que s�rie non install�e.
+Gui.NoSerialLibDialogTitle=Aucun port s�rie
+Gui.NoSerialLibDialogText=<html>Il n'y a pas de port s�rie, ou la biblioth�que s�rie n'est pas install�e ou n'est pas visible.<br>Veuillez aller sur http://adtpro.com/install.html pour de plus amples renseignements.</html>
 Gui.File=Fichier
 Gui.Config=Configuration
 Gui.IIc=C�ble Apple IIc avec Imagewriter