From e318ff5750f19b378473e728c1508fb42cf1311b Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Fri, 1 Dec 2006 01:27:06 +0000 Subject: [PATCH] o property for the conversion properties o update the conversion script to use the property o rename the properties used for conversion to be clear o get rid of the java.net stuff until they clean their stuff up git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@481124 13f79535-47bb-0310-9956-ffa450edef68 --- .../{synchronize.properties => conversion.properties} | 0 maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh | 2 +- .../src/bin/m1-m2-conversion/synchronize-java.net.properties | 3 --- maven-meeper/src/bin/synchronize.properties | 1 + 4 files changed, 2 insertions(+), 4 deletions(-) rename maven-meeper/src/bin/m1-m2-conversion/{synchronize.properties => conversion.properties} (100%) delete mode 100644 maven-meeper/src/bin/m1-m2-conversion/synchronize-java.net.properties diff --git a/maven-meeper/src/bin/m1-m2-conversion/synchronize.properties b/maven-meeper/src/bin/m1-m2-conversion/conversion.properties similarity index 100% rename from maven-meeper/src/bin/m1-m2-conversion/synchronize.properties rename to maven-meeper/src/bin/m1-m2-conversion/conversion.properties diff --git a/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh b/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh index 1db947a2d..51dfcda8c 100755 --- a/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh +++ b/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh @@ -4,7 +4,7 @@ syncProperties=$1 . $syncProperties -$JAVA -jar archiva-cli-1.0-SNAPSHOT-cli.jar -c synchronize.properties +$JAVA -jar archiva-cli-1.0-SNAPSHOT-cli.jar -c $CONVERSION_PROPERTIES dir=/home/maven/repository-staging/to-ibiblio src=$dir/maven2-converted-from-maven1 diff --git a/maven-meeper/src/bin/m1-m2-conversion/synchronize-java.net.properties b/maven-meeper/src/bin/m1-m2-conversion/synchronize-java.net.properties deleted file mode 100644 index 702a9f6b6..000000000 --- a/maven-meeper/src/bin/m1-m2-conversion/synchronize-java.net.properties +++ /dev/null @@ -1,3 +0,0 @@ -sourceRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven-java.net -targetRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven2-repoclean -blacklistedPatterns=**/*.pom diff --git a/maven-meeper/src/bin/synchronize.properties b/maven-meeper/src/bin/synchronize.properties index fc3fac271..3bb9cde39 100644 --- a/maven-meeper/src/bin/synchronize.properties +++ b/maven-meeper/src/bin/synchronize.properties @@ -6,6 +6,7 @@ export SYNC_TOOLS=$TOOLS_BASE/synchronize export SYNCOPATE=$SYNC_TOOLS/syncopate export M2_SYNC=$SYNC_TOOLS/m2-sync export REPOCLEAN=$TOOLS_BASE/m1-m2-conversion +export CONVERSION_PROPERTIES=$REPOCLEAN/conversion.properties export M1_M2_REWRITE_RULES=$SYNC_TOOLS/m1-m2-mod-rewrite-rules.txt export SYNC_REPORTS=$HOME/repository-staging/to-ibiblio/reports/sync export IBIBLIO_SYNC_HOST=login.ibiblio.org -- 2.39.5