From 45b39ee1beba9e60b2bd9ba2895f0701f5ead03f Mon Sep 17 00:00:00 2001 From: theli Date: Wed, 14 Jun 2006 15:18:41 +0000 Subject: [PATCH] *) solving unpacking problems with to long filename by a) renaming the parent folder in the tgz file to yacy (can be configured via build properties file) b) reconfiguring build file to throw an error if a file name is too long Please note that currently there is _no_ proplem with too long class names because of step a. git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2207 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- build.properties | 1 + build.xml | 14 +++---- ...ctly_If_not_please_use_gnu_tar_instead.txt | 7 ---- source/de/anomic/plasma/parser/bzip/build.xml | 6 +-- source/de/anomic/plasma/parser/doc/build.xml | 6 +-- source/de/anomic/plasma/parser/gzip/build.xml | 4 +- .../anomic/plasma/parser/mimeType/build.xml | 6 +-- source/de/anomic/plasma/parser/odt/build.xml | 6 +-- source/de/anomic/plasma/parser/pdf/build.xml | 6 +-- source/de/anomic/plasma/parser/rpm/build.xml | 6 +-- source/de/anomic/plasma/parser/rss/build.xml | 6 +-- source/de/anomic/plasma/parser/rtf/build.xml | 4 +- source/de/anomic/plasma/parser/tar/build.xml | 6 +-- source/de/anomic/plasma/parser/vcf/build.xml | 6 +-- source/de/anomic/plasma/parser/zip/build.xml | 4 +- source/yacy.java | 37 ++++++++++--------- 16 files changed, 60 insertions(+), 65 deletions(-) delete mode 100644 doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt diff --git a/build.properties b/build.properties index aa64a21bb..b32aff549 100644 --- a/build.properties +++ b/build.properties @@ -8,6 +8,7 @@ releaseFile=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz #releaseFile=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr}.tar.gz releaseDir=yacy_dev_v${releaseVersion}_${DSTAMP}_${releaseNr} #releaseDir=yacy_v${releaseVersion}_${DSTAMP}_${releaseNr} +releaseFileParentDir=yacy releaseNr=$Revision$ # defining some file/directory access rights diff --git a/build.xml b/build.xml index e2d3f3669..e612cdb37 100644 --- a/build.xml +++ b/build.xml @@ -514,14 +514,14 @@ ======================================================================================================= --> - + - + - + @@ -536,20 +536,20 @@ - + - + - + - + diff --git a/doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt b/doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt deleted file mode 100644 index 418cd6066..000000000 --- a/doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt +++ /dev/null @@ -1,7 +0,0 @@ - // Testing if the yacy archive file were unzipped correctly. - // This test is needed because of classfile-names longer than 100 chars - // which could cause problems with incompatible unzip software. - // See: - // - http://www.yacy-forum.de/viewtopic.php?t=1763 - // - http://www.yacy-forum.de/viewtopic.php?t=715 - // - http://www.yacy-forum.de/viewtopic.php?t=1674 \ No newline at end of file diff --git a/source/de/anomic/plasma/parser/bzip/build.xml b/source/de/anomic/plasma/parser/bzip/build.xml index af5e6ce16..f3a24e3ad 100644 --- a/source/de/anomic/plasma/parser/bzip/build.xml +++ b/source/de/anomic/plasma/parser/bzip/build.xml @@ -24,13 +24,13 @@ diff --git a/source/de/anomic/plasma/parser/doc/build.xml b/source/de/anomic/plasma/parser/doc/build.xml index 585674b87..187d413a3 100644 --- a/source/de/anomic/plasma/parser/doc/build.xml +++ b/source/de/anomic/plasma/parser/doc/build.xml @@ -26,13 +26,13 @@ diff --git a/source/de/anomic/plasma/parser/gzip/build.xml b/source/de/anomic/plasma/parser/gzip/build.xml index 7c713c972..8b3d1f956 100644 --- a/source/de/anomic/plasma/parser/gzip/build.xml +++ b/source/de/anomic/plasma/parser/gzip/build.xml @@ -22,10 +22,10 @@ diff --git a/source/de/anomic/plasma/parser/mimeType/build.xml b/source/de/anomic/plasma/parser/mimeType/build.xml index 092aa817c..20c20f6a9 100644 --- a/source/de/anomic/plasma/parser/mimeType/build.xml +++ b/source/de/anomic/plasma/parser/mimeType/build.xml @@ -29,13 +29,13 @@ diff --git a/source/de/anomic/plasma/parser/odt/build.xml b/source/de/anomic/plasma/parser/odt/build.xml index 25ae3e5d5..834af02bb 100644 --- a/source/de/anomic/plasma/parser/odt/build.xml +++ b/source/de/anomic/plasma/parser/odt/build.xml @@ -24,13 +24,13 @@ diff --git a/source/de/anomic/plasma/parser/pdf/build.xml b/source/de/anomic/plasma/parser/pdf/build.xml index cf752cb3c..16c9a2b6c 100644 --- a/source/de/anomic/plasma/parser/pdf/build.xml +++ b/source/de/anomic/plasma/parser/pdf/build.xml @@ -26,13 +26,13 @@ diff --git a/source/de/anomic/plasma/parser/rpm/build.xml b/source/de/anomic/plasma/parser/rpm/build.xml index c6fbe0e54..5ef220e10 100644 --- a/source/de/anomic/plasma/parser/rpm/build.xml +++ b/source/de/anomic/plasma/parser/rpm/build.xml @@ -25,13 +25,13 @@ diff --git a/source/de/anomic/plasma/parser/rss/build.xml b/source/de/anomic/plasma/parser/rss/build.xml index 0bd53c05e..f8b51bd45 100644 --- a/source/de/anomic/plasma/parser/rss/build.xml +++ b/source/de/anomic/plasma/parser/rss/build.xml @@ -31,13 +31,13 @@ diff --git a/source/de/anomic/plasma/parser/rtf/build.xml b/source/de/anomic/plasma/parser/rtf/build.xml index 0606900fb..270df8305 100644 --- a/source/de/anomic/plasma/parser/rtf/build.xml +++ b/source/de/anomic/plasma/parser/rtf/build.xml @@ -22,10 +22,10 @@ diff --git a/source/de/anomic/plasma/parser/tar/build.xml b/source/de/anomic/plasma/parser/tar/build.xml index ba33ae2bf..85fbb3e26 100644 --- a/source/de/anomic/plasma/parser/tar/build.xml +++ b/source/de/anomic/plasma/parser/tar/build.xml @@ -25,13 +25,13 @@ diff --git a/source/de/anomic/plasma/parser/vcf/build.xml b/source/de/anomic/plasma/parser/vcf/build.xml index f40c34538..5270df9f2 100644 --- a/source/de/anomic/plasma/parser/vcf/build.xml +++ b/source/de/anomic/plasma/parser/vcf/build.xml @@ -24,13 +24,13 @@ diff --git a/source/de/anomic/plasma/parser/zip/build.xml b/source/de/anomic/plasma/parser/zip/build.xml index 317d7b3d2..53375b3a8 100644 --- a/source/de/anomic/plasma/parser/zip/build.xml +++ b/source/de/anomic/plasma/parser/zip/build.xml @@ -22,10 +22,10 @@ diff --git a/source/yacy.java b/source/yacy.java index fd7b6e7f0..6f112a534 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -229,24 +229,25 @@ public final class yacy { final File dataFolder = new File(homePath, "DATA"); if (!(dataFolder.exists())) dataFolder.mkdir(); - // Testing if the yacy archive file were unzipped correctly. - // This test is needed because of classfile-names longer than 100 chars - // which could cause problems with incompatible unzip software. - // See: - // - http://www.yacy-forum.de/viewtopic.php?t=1763 - // - http://www.yacy-forum.de/viewtopic.php?t=715 - // - http://www.yacy-forum.de/viewtopic.php?t=1674 - File unzipTest = new File(homePath,"doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt"); - if (!unzipTest.exists()) { - String errorMsg = "The archive file containing YaCy was not unpacked correctly. " + - "Please use 'GNU-Tar' or upgrade to a newer version of your unzip software.\n" + - "For detailed information on this bug see: " + - "http://www.yacy-forum.de/viewtopic.php?t=715"; - System.err.println(errorMsg); - serverLog.logSevere("STARTUP", errorMsg); - System.exit(1); - } - + /* + // Testing if the yacy archive file were unzipped correctly. + // This test is needed because of classfile-names longer than 100 chars + // which could cause problems with incompatible unzip software. + // See: + // - http://www.yacy-forum.de/viewtopic.php?t=1763 + // - http://www.yacy-forum.de/viewtopic.php?t=715 + // - http://www.yacy-forum.de/viewtopic.php?t=1674 + File unzipTest = new File(homePath,"doc/This_is_a_test_if_the_archive_file_containing_YaCy_was_unpacked_correctly_If_not_please_use_gnu_tar_instead.txt"); + if (!unzipTest.exists()) { + String errorMsg = "The archive file containing YaCy was not unpacked correctly. " + + "Please use 'GNU-Tar' or upgrade to a newer version of your unzip software.\n" + + "For detailed information on this bug see: " + + "http://www.yacy-forum.de/viewtopic.php?t=715"; + System.err.println(errorMsg); + serverLog.logSevere("STARTUP", errorMsg); + System.exit(1); + } + */ final plasmaSwitchboard sb = new plasmaSwitchboard(homePath, "yacy.init", "DATA/SETTINGS/httpProxy.conf");