Author: jvanzyl
Date: Wed Nov 22 19:28:35 2006
New Revision: 478449
URL: http://svn.apache.org/viewvc?view=rev&rev=478449
Log:
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
Modified:
maven/archiva/trunk/maven-meeper/src/bin/crontab.txt
maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties
maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh
Modified: maven/archiva/trunk/maven-meeper/src/bin/crontab.txt
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/crontab.txt?view=diff&rev=478449&r1=478448&r2=478449
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/crontab.txt (original)
+++ maven/archiva/trunk/maven-meeper/src/bin/crontab.txt Wed Nov 22 19:28:35
2006
@@ -1,4 +1,4 @@
# Cron jobs for the maven repository
[EMAIL PROTECTED]
-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
Modified:
maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh?view=diff&rev=478449&r1=478448&r2=478449
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
(original)
+++ maven/archiva/trunk/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
Wed Nov 22 19:28:35 2006
@@ -4,8 +4,7 @@
. $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
Modified: maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties?view=diff&rev=478449&r1=478448&r2=478449
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties (original)
+++ maven/archiva/trunk/maven-meeper/src/bin/synchronize.properties Wed Nov 22
19:28:35 2006
@@ -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
Modified: maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh?view=diff&rev=478449&r1=478448&r2=478449
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh (original)
+++ maven/archiva/trunk/maven-meeper/src/bin/synchronize.sh Wed Nov 22 19:28:35
2006
@@ -34,6 +34,7 @@
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
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh?view=diff&rev=478449&r1=478448&r2=478449
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh
(original)
+++ maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh Wed
Nov 22 19:28:35 2006
@@ -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 @@
# 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
