Description: This patch fix compilation for ftp class Forwarded: not-needed Author: Mathieu Malaterre Last-Update: Tue, 21 Jul 2015 16:17:52 +0200 --- a/Makefile +++ b/Makefile @@ -211,11 +211,11 @@ WEBSTARTFILES = \ webstart/pixelmed.jar \ webstart/pixelmed_imageio.jar \ webstart/${COMMONSCODECJARFILENAME} \ - webstart/commons-net-ftp-2.0.jar \ + webstart/commons-net.jar \ webstart/hsqldb.jar \ webstart/jmdns.jar \ webstart/${COMMONSCOMPRESSJARFILENAME} \ - webstart/vecmath1.2-1.14.jar \ + webstart/vecmath.jar \ webstart/icons/ConvertAmicasJPEG2000FilesetToDicom.png \ webstart/icons/DicomCleaner.png \ webstart/icons/DicomImageBlackout.png \ @@ -253,10 +253,10 @@ DEPENDENCYRELEASEFILESWITHOUTREADME = \ lib/additional/pixelmed_codec.jar \ lib/additional/pixelmed_imageio.jar \ ${COMMONSCODECADDITIONALJAR} \ - lib/additional/commons-net-ftp-2.0.jar \ + lib/additional/commons-net.jar \ ${COMMONSCOMPRESSADDITIONALJAR} \ lib/additional/hsqldb.jar \ - lib/additional/vecmath1.2-1.14.jar \ + lib/additional/vecmath.jar \ lib/additional/jmdns.jar \ lib/additional/aiviewer.jar \ lib/additional/javax.json-1.0.4.jar \ @@ -266,7 +266,7 @@ DEPENDENCYRELEASEFILESWITHOUTREADME = \ lib/additional/opencsv-2.4.jar \ lib/additional/saxon-he-12.5.jar \ lib/additional/xmlresolver-5.2.2.jar \ - lib/junit/junit-4.8.1.jar \ + lib/junit/junit4.jar \ LICENSES DEPENDENCYRELEASEFILES = \ @@ -278,16 +278,16 @@ DICOMCLEANERDEPENDENCYRELEASEFILES = \ ${COMMONSCODECADDITIONALJAR} \ ${COMMONSCOMPRESSADDITIONALJAR} \ lib/additional/hsqldb.jar \ - lib/additional/vecmath1.2-1.14.jar \ + lib/additional/vecmath.jar \ lib/additional/jmdns.jar \ LICENSES/hsqldb_lic.txt DOSEUTILITYDEPENDENCYRELEASEFILES = \ ${COMMONSCODECADDITIONALJAR} \ - lib/additional/commons-net-ftp-2.0.jar \ + lib/additional/commons-net.jar \ ${COMMONSCOMPRESSADDITIONALJAR} \ lib/additional/hsqldb.jar \ - lib/additional/vecmath1.2-1.14.jar \ + lib/additional/vecmath.jar \ lib/additional/jmdns.jar \ LICENSES/hsqldb_lic.txt @@ -334,7 +334,7 @@ MACAPPRELEASEFILES = \ DicomImageViewer.app/Contents/Java/pixelmed_imageio.jar \ DicomImageViewer.app/Contents/Java/hsqldb.jar \ DicomImageViewer.app/Contents/Java/${COMMONSCOMPRESSJARFILENAME} \ - DicomImageViewer.app/Contents/Java/vecmath1.2-1.14.jar \ + DicomImageViewer.app/Contents/Java/vecmath.jar \ DicomImageViewer.app/Contents/Java/${COMMONSCODECJARFILENAME} \ DicomImageViewer.app/Contents/Java/jai_imageio.jar \ DicomImageViewer.app/Contents/Java/jmdns.jar \ @@ -357,7 +357,7 @@ MACAPPRELEASEFILES = \ DoseUtility.app/Contents/Java/hsqldb.jar \ DoseUtility.app/Contents/Java/${COMMONSCOMPRESSJARFILENAME} \ DoseUtility.app/Contents/Java/${COMMONSCODECJARFILENAME} \ - DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar \ + DoseUtility.app/Contents/Java/commons-net.jar \ DoseUtility.app/Contents/Java/jmdns.jar \ DoseUtility.app/Contents/Java/jai_imageio.jar @@ -526,7 +526,7 @@ webstart/${COMMONSCODECJARFILENAME}: ${C jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS} jarsigner -verify $@ -webstart/commons-net-ftp-2.0.jar: lib/additional/commons-net-ftp-2.0.jar +webstart/commons-net.jar: lib/additional/commons-net.jar mkdir -p webstart cp $< $@ jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS} @@ -550,7 +550,7 @@ webstart/${COMMONSCOMPRESSJARFILENAME}: jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS} jarsigner -verify $@ -webstart/vecmath1.2-1.14.jar: lib/additional/vecmath1.2-1.14.jar +webstart/vecmath.jar: lib/additional/vecmath.jar mkdir -p webstart cp $< $@ jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS} @@ -753,7 +753,7 @@ DicomImageViewer_app: \ DicomImageViewer.app/Contents/Java/pixelmed_imageio.jar \ DicomImageViewer.app/Contents/Java/hsqldb.jar \ DicomImageViewer.app/Contents/Java/${COMMONSCOMPRESSJARFILENAME} \ - DicomImageViewer.app/Contents/Java/vecmath1.2-1.14.jar \ + DicomImageViewer.app/Contents/Java/vecmath.jar \ DicomImageViewer.app/Contents/Java/${COMMONSCODECJARFILENAME} \ DicomImageViewer.app/Contents/Java/jai_imageio.jar \ DicomImageViewer.app/Contents/Java/jmdns.jar \ @@ -778,7 +778,7 @@ DicomImageViewer.app/Contents/Java/${COM mkdir -p DicomImageViewer.app/Contents/Java cp $< $@ -DicomImageViewer.app/Contents/Java/vecmath1.2-1.14.jar: lib/additional/vecmath1.2-1.14.jar +DicomImageViewer.app/Contents/Java/vecmath.jar: lib/additional/vecmath.jar mkdir -p DicomImageViewer.app/Contents/Java cp $< $@ @@ -859,7 +859,7 @@ DoseUtility_app: \ DoseUtility.app/Contents/Java/hsqldb.jar \ DoseUtility.app/Contents/Java/${COMMONSCOMPRESSJARFILENAME} \ DoseUtility.app/Contents/Java/${COMMONSCODECJARFILENAME} \ - DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar \ + DoseUtility.app/Contents/Java/commons-net.jar \ DoseUtility.app/Contents/Java/jmdns.jar \ DoseUtility.app/Contents/Java/jai_imageio.jar \ DoseUtility.app/Contents/Resources/DoseUtility.icns \ @@ -887,7 +887,7 @@ DoseUtility.app/Contents/Java/${COMMONSC mkdir -p DoseUtility.app/Contents/Java cp $< $@ -DoseUtility.app/Contents/Java/commons-net-ftp-2.0.jar: lib/additional/commons-net-ftp-2.0.jar +DoseUtility.app/Contents/Java/commons-net.jar: lib/additional/commons-net.jar mkdir -p DoseUtility.app/Contents/Java cp $< $@ @@ -1091,7 +1091,7 @@ windows.lib: (cd windows; make lib); \ fi -# used to link to "http://www.junit.org/apidocs/" but this no longer works ... use version-specific "http://javasourcecode.org/html/open-source/junit/junit-4.8.1/" instead +# used to link to "http://www.junit.org/apidocs/" but this no longer works ... use version-specific "http://javasourcecode.org/html/open-source/junit/junit4/" instead # used to link to "http://jpedal.org/javadoc/" but this no longer works ... tried archive.org copy ("http://web.archive.org/web/20121002020430/http://jpedal.org/javadoc/") instead but gives "error fetching" ... see also possibly related "http://javadoc.idrsolutions.com/" (does not respond), "https://domaingang.com/domain-law/jpedal-org-complainant-gets-domain-back-after-it-lapsed-via-the-udrp-process/" javadoc: rm -rf docs/javadoc --- a/Makefile.common.mk +++ b/Makefile.common.mk @@ -52,7 +52,7 @@ DISPLAYADDITIONALJARS = ${DICOMADDITIONA DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar -FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net-ftp-2.0.jar +FTPADDITIONALJARS = ${PATHTOADDITIONAL}/commons-net.jar CSVADDITIONALJARS = ${PATHTOADDITIONAL}/opencsv-2.4.jar --- a/webstart/DoseUtility.jnlp +++ b/webstart/DoseUtility.jnlp @@ -19,7 +19,7 @@ - +