o moving script to top level bin/ directory on the maven.org machine and adjusting accordingly

o use a variable for the exclusion file in the m2 sync scripts


git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@478449 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 11 insertions, 7 deletions

diff --git a/maven-meeper/src/bin/crontab.txt b/maven-meeper/src/bin/crontab.txt
index daa6b9b4d..938519813 100644
--- a/maven-meeper/src/bin/crontab.txt
+++ b/maven-meeper/src/bin/crontab.txt
@@ -1,4 +1,4 @@
 # Cron jobs for the maven repository
 MAILTO=jason@maven.org
-0  */4 * * * cd $HOME/components/maven-meeper/src/bin; ./synchronize.sh
+0  */4 * * * cd $HOME/bin; ./synchronize.sh
 0   0  * * * cd $HOME/reports; ./run.sh
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 fa9f4d16b..1db947a2d 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,8 +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 synchronize-java.net.properties
+$JAVA -jar archiva-cli-1.0-SNAPSHOT-cli.jar -c synchronize.properties
 
 dir=/home/maven/repository-staging/to-ibiblio
 src=$dir/maven2-converted-from-maven1
diff --git a/maven-meeper/src/bin/synchronize.properties b/maven-meeper/src/bin/synchronize.properties
index f96322822..b5d88017d 100644
--- a/maven-meeper/src/bin/synchronize.properties
+++ b/maven-meeper/src/bin/synchronize.properties
@@ -1,13 +1,15 @@
 #!/bin/sh
 
 export CENTRAL_HOST=maven01.managed.contegix.com
-export TOOLS_BASE=$HOME/components/maven-meeper/src/bin
+export TOOLS_BASE=$HOME/bin
 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 M1_M2_REWRITE_RULES=$SYNC_TOOLS/m1-m2-mod-rewrite-rules.txt
 export SYNC_REPORTS=$HOME/repository-staging/to-ibiblio/reports/sync
+export JAVA_HOME=/opt/java/sdk/current
+export JAVA=$JAVA_HOME/bin/java
 
 export STAGING_DIR=$HOME/repository-staging/to-ibiblio
 export MAVEN1_REPO=$STAGING_DIR/maven
diff --git a/maven-meeper/src/bin/synchronize.sh b/maven-meeper/src/bin/synchronize.sh
index de648a682..0f2c28e31 100755
--- a/maven-meeper/src/bin/synchronize.sh
+++ b/maven-meeper/src/bin/synchronize.sh
@@ -34,6 +34,7 @@ echo "SYNCOPATE = $SYNCOPATE"
 echo "REPOCLEAN = $REPOCLEAN"
 echo "M1_M2_REWRITE_RULES = $M1_M2_REWRITE_RULES"
 echo "SYNC_REPORTS = $SYNC_REPORTS"
+echo "JAVA = $JAVA"
 
 [ "$MODE" = "batch" ] && echo && echo "Press any key to continue, or hit ^C to quit." && echo
 
diff --git a/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh b/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh
index 0559972ba..4c79f9574 100755
--- a/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh
+++ b/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+exclusions=$HOME/bin/synchronize/syncopate/exclusions.txt
+
 echo This script is very temporary. Please validate all input files in the source repository before blindly copying them in.
 echo Ensure all artifacts have a valid POM.
 echo This will be removed when the repository manager is in place.
@@ -47,13 +49,13 @@ for f in `find conf -maxdepth 1 -iname "*.sh"`
   # check for changed files
   if [ "$1" == "check" ]; then
 
-    rsync -n --exclude=**/maven-metadata.xml* --exclude-from=$HOME/components/maven-meeper/src/bin/synchronize/syncopate/exclusions.txt --existing $RSYNC_OPTS -Lrtivzc "$RSYNC_SSH" $FROM/$GROUP_DIR $BASEDIR/$GROUP_DIR >> $CHANGED_LOG
+    rsync -n --exclude=**/maven-metadata.xml* --exclude-from=$exclusions --existing $RSYNC_OPTS -Lrtivzc "$RSYNC_SSH" $FROM/$GROUP_DIR $BASEDIR/$GROUP_DIR >> $CHANGED_LOG
 
   else
 
     echo "Syncing $FROM -> $GROUP_DIR"
-    rsync --include=*/ --include=**/maven-metadata.xml* --exclude=* --exclude-from=$HOME/components/maven-meeper/src/bin/synchronize/syncopate/exclusions.txt $RSYNC_OPTS -Lrtivz "$RSYNC_SSH" $FROM/$GROUP_DIR $BASEDIR/$GROUP_DIR
-    rsync --exclude-from=$HOME/components/maven-meeper/src/bin/synchronize/syncopate/exclusions.txt --ignore-existing $RSYNC_OPTS -Lrtivz "$RSYNC_SSH" $FROM/$GROUP_DIR $BASEDIR/$GROUP_DIR
+    rsync --include=*/ --include=**/maven-metadata.xml* --exclude=* --exclude-from=$exclusions $RSYNC_OPTS -Lrtivz "$RSYNC_SSH" $FROM/$GROUP_DIR $BASEDIR/$GROUP_DIR
+    rsync --exclude-from=$exclusions --ignore-existing $RSYNC_OPTS -Lrtivz "$RSYNC_SSH" $FROM/$GROUP_DIR $BASEDIR/$GROUP_DIR
 
   fi