From 39819a074ceffd6b4f31e5ef3692f8f4a7fca3d2 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 11 Oct 2006 22:19:42 +0000 Subject: [PATCH] git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@463003 13f79535-47bb-0310-9956-ffa450edef68 --- maven-meeper/src/bin/synchronize.properties | 3 +++ maven-meeper/src/bin/synchronize.sh | 11 +++++++++++ .../src/bin/synchronize/deploy-ibiblio-htaccess.sh | 10 ---------- .../{ibiblio-htaccess => m1-m2-mod-rewrite-rules.txt} | 0 4 files changed, 14 insertions(+), 10 deletions(-) delete mode 100755 maven-meeper/src/bin/synchronize/deploy-ibiblio-htaccess.sh rename maven-meeper/src/bin/synchronize/{ibiblio-htaccess => m1-m2-mod-rewrite-rules.txt} (100%) diff --git a/maven-meeper/src/bin/synchronize.properties b/maven-meeper/src/bin/synchronize.properties index 361464a32..82da23196 100644 --- a/maven-meeper/src/bin/synchronize.properties +++ b/maven-meeper/src/bin/synchronize.properties @@ -1,5 +1,8 @@ +#!/bin/sh + export CENTRAL_HOST=maven01.managed.contegix.com export TOOLS_BASE=$HOME/components/maven-meeper/src/bin export SYNC_TOOLS=$TOOLS_BASE/synchronize export SYNCOPATE=$SYNC_TOOLS/syncopate export REPOCLEAN=$TOOLS_BASE/m1-m2-conversion +export M1_M2_REWRITE_RULES=$SYNC_TOOLS/m1-m2-mod-rewrite-rules.txt diff --git a/maven-meeper/src/bin/synchronize.sh b/maven-meeper/src/bin/synchronize.sh index 87dd4e1e9..f6a6de401 100755 --- a/maven-meeper/src/bin/synchronize.sh +++ b/maven-meeper/src/bin/synchronize.sh @@ -5,6 +5,7 @@ # 2. Convert Maven 1.x repository to Maven 2.x repository # 3. Manual fixes # 4. Sync the Maven 2.x repository to Ibiblio +# 5. Copy the mod_rewrite rules to the Maven 2.x repository # ------------------------------------------------------------------------ PID=$$ @@ -65,3 +66,13 @@ echo Synchronizing to ibiblio ) retval=$?; if [ $retval != 0 ]; then exit $retval; fi +# ------------------------------------------------------------------------ +# Copy the mod_rewrite rules to the Maven 1.x repository +# ------------------------------------------------------------------------ +if [ "hostname" == $CENTRAL_HOST ]; then + cp $M1_M2_REWRITE_RULES $HOME/repository-staging/to-ibiblio/maven/.htaccess +else + scp $M1_M2_REWRITE_RULES maven@maven.org:~maven/repository-staging/to-ibiblio/maven/.htaccess +fi + +scp $M1_M2_REWRITE_RULES maven@login.ibiblio.org:/public/html/maven/.htaccess diff --git a/maven-meeper/src/bin/synchronize/deploy-ibiblio-htaccess.sh b/maven-meeper/src/bin/synchronize/deploy-ibiblio-htaccess.sh deleted file mode 100755 index bdfe41888..000000000 --- a/maven-meeper/src/bin/synchronize/deploy-ibiblio-htaccess.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if [ "`hostname`" == $CENTRAL_HOST ]; then - cp ibiblio-htaccess $HOME/repository-staging/to-ibiblio/maven/.htaccess -else - scp ibiblio-htaccess maven@maven.org:~maven/repository-staging/to-ibiblio/maven/.htaccess -fi - -scp ibiblio-htaccess maven@login.ibiblio.org:/public/html/maven/.htaccess - diff --git a/maven-meeper/src/bin/synchronize/ibiblio-htaccess b/maven-meeper/src/bin/synchronize/m1-m2-mod-rewrite-rules.txt similarity index 100% rename from maven-meeper/src/bin/synchronize/ibiblio-htaccess rename to maven-meeper/src/bin/synchronize/m1-m2-mod-rewrite-rules.txt