From e11df5befcf794e3f7eea535a42d23021b45ace8 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Gonzalez Date: Sat, 29 Jul 2006 14:57:06 +0000 Subject: [PATCH] Moved config files to conf git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@426814 13f79535-47bb-0310-9956-ffa450edef68 --- .../m2-sync/{ => conf}/codehaus-m2-sync.sh | 2 -- .../src/bin/m2-sync/{ => conf}/displaytag.sh | 2 -- .../bin/m2-sync/{ => conf}/net.databinder.sh | 2 -- .../{ => conf}/net.sourceforge.jwebunit.sh | 2 -- .../net.sourceforge.maven-taglib.sh | 2 -- .../m2-sync/{ => conf}/org.acegisecurity.sh | 2 -- .../src/bin/m2-sync/{ => conf}/org.apache.sh | 2 -- .../src/bin/m2-sync/{ => conf}/org.mortbay.sh | 2 -- .../bin/m2-sync/{ => conf}/org.objectweb.sh | 2 -- .../src/bin/m2-sync/{ => conf}/wicket.sh | 2 -- maven-meeper/src/bin/m2-sync/m2-sync.sh | 34 +++++++++++++------ 11 files changed, 23 insertions(+), 31 deletions(-) rename maven-meeper/src/bin/m2-sync/{ => conf}/codehaus-m2-sync.sh (93%) rename maven-meeper/src/bin/m2-sync/{ => conf}/displaytag.sh (84%) rename maven-meeper/src/bin/m2-sync/{ => conf}/net.databinder.sh (81%) rename maven-meeper/src/bin/m2-sync/{ => conf}/net.sourceforge.jwebunit.sh (87%) rename maven-meeper/src/bin/m2-sync/{ => conf}/net.sourceforge.maven-taglib.sh (88%) rename maven-meeper/src/bin/m2-sync/{ => conf}/org.acegisecurity.sh (87%) rename maven-meeper/src/bin/m2-sync/{ => conf}/org.apache.sh (85%) rename maven-meeper/src/bin/m2-sync/{ => conf}/org.mortbay.sh (80%) rename maven-meeper/src/bin/m2-sync/{ => conf}/org.objectweb.sh (83%) rename maven-meeper/src/bin/m2-sync/{ => conf}/wicket.sh (83%) diff --git a/maven-meeper/src/bin/m2-sync/codehaus-m2-sync.sh b/maven-meeper/src/bin/m2-sync/conf/codehaus-m2-sync.sh similarity index 93% rename from maven-meeper/src/bin/m2-sync/codehaus-m2-sync.sh rename to maven-meeper/src/bin/m2-sync/conf/codehaus-m2-sync.sh index 7605fb5a0b..3cad2d5208 100755 --- a/maven-meeper/src/bin/m2-sync/codehaus-m2-sync.sh +++ b/maven-meeper/src/bin/m2-sync/conf/codehaus-m2-sync.sh @@ -7,5 +7,3 @@ SSH_OPTS="-i $HOME/.ssh/new-id_dsa" ## NOTE that codehaus only honours some rsync options. Others may be summarily discarded and/or cause the rsync to break - check ## with them if changing them - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/displaytag.sh b/maven-meeper/src/bin/m2-sync/conf/displaytag.sh similarity index 84% rename from maven-meeper/src/bin/m2-sync/displaytag.sh rename to maven-meeper/src/bin/m2-sync/conf/displaytag.sh index dfc7cf3fc3..066a3bc56c 100755 --- a/maven-meeper/src/bin/m2-sync/displaytag.sh +++ b/maven-meeper/src/bin/m2-sync/conf/displaytag.sh @@ -2,5 +2,3 @@ FROM=carlossg@shell.sourceforge.net:/home/groups/d/di/displaytag/htdocs/m2repo/displaytag/ TO=displaytag/ - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/net.databinder.sh b/maven-meeper/src/bin/m2-sync/conf/net.databinder.sh similarity index 81% rename from maven-meeper/src/bin/m2-sync/net.databinder.sh rename to maven-meeper/src/bin/m2-sync/conf/net.databinder.sh index 459110b445..3aa46d3e48 100755 --- a/maven-meeper/src/bin/m2-sync/net.databinder.sh +++ b/maven-meeper/src/bin/m2-sync/conf/net.databinder.sh @@ -4,5 +4,3 @@ FROM=rsync://databinder.net/maven/net/databinder/ TO=net/databinder/ NO_SSH=true - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/net.sourceforge.jwebunit.sh b/maven-meeper/src/bin/m2-sync/conf/net.sourceforge.jwebunit.sh similarity index 87% rename from maven-meeper/src/bin/m2-sync/net.sourceforge.jwebunit.sh rename to maven-meeper/src/bin/m2-sync/conf/net.sourceforge.jwebunit.sh index 273ea02036..f2ac8a90bd 100755 --- a/maven-meeper/src/bin/m2-sync/net.sourceforge.jwebunit.sh +++ b/maven-meeper/src/bin/m2-sync/conf/net.sourceforge.jwebunit.sh @@ -2,5 +2,3 @@ FROM=carlossg@shell.sourceforge.net:/home/groups/j/jw/jwebunit/htdocs/m2-repo/net/sourceforge/jwebunit/ TO=net/sourceforge/jwebunit/ - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/net.sourceforge.maven-taglib.sh b/maven-meeper/src/bin/m2-sync/conf/net.sourceforge.maven-taglib.sh similarity index 88% rename from maven-meeper/src/bin/m2-sync/net.sourceforge.maven-taglib.sh rename to maven-meeper/src/bin/m2-sync/conf/net.sourceforge.maven-taglib.sh index d30d9451a7..fcf9ce171a 100755 --- a/maven-meeper/src/bin/m2-sync/net.sourceforge.maven-taglib.sh +++ b/maven-meeper/src/bin/m2-sync/conf/net.sourceforge.maven-taglib.sh @@ -2,5 +2,3 @@ FROM=carlossg@shell.sourceforge.net:/home/groups/m/ma/maven-taglib/htdocs/m2repo/net/sourceforge/maven-taglib/ TO=net/sourceforge/maven-taglib/ - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/org.acegisecurity.sh b/maven-meeper/src/bin/m2-sync/conf/org.acegisecurity.sh similarity index 87% rename from maven-meeper/src/bin/m2-sync/org.acegisecurity.sh rename to maven-meeper/src/bin/m2-sync/conf/org.acegisecurity.sh index ab36c3d976..cfac3c693b 100755 --- a/maven-meeper/src/bin/m2-sync/org.acegisecurity.sh +++ b/maven-meeper/src/bin/m2-sync/conf/org.acegisecurity.sh @@ -2,5 +2,3 @@ FROM=carlossg@shell.sourceforge.net:/home/groups/a/ac/acegisecurity/htdocs/repository/releases/org/acegisecurity/ TO=org/acegisecurity/ - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/org.apache.sh b/maven-meeper/src/bin/m2-sync/conf/org.apache.sh similarity index 85% rename from maven-meeper/src/bin/m2-sync/org.apache.sh rename to maven-meeper/src/bin/m2-sync/conf/org.apache.sh index 6f8d918109..2b79e153ac 100755 --- a/maven-meeper/src/bin/m2-sync/org.apache.sh +++ b/maven-meeper/src/bin/m2-sync/conf/org.apache.sh @@ -2,5 +2,3 @@ FROM=jvanzyl@people.apache.org:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/ TO=org/apache/ - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/org.mortbay.sh b/maven-meeper/src/bin/m2-sync/conf/org.mortbay.sh similarity index 80% rename from maven-meeper/src/bin/m2-sync/org.mortbay.sh rename to maven-meeper/src/bin/m2-sync/conf/org.mortbay.sh index 5608962a69..6e5d5f123d 100755 --- a/maven-meeper/src/bin/m2-sync/org.mortbay.sh +++ b/maven-meeper/src/bin/m2-sync/conf/org.mortbay.sh @@ -2,5 +2,3 @@ FROM=rsync@jetty.mortbay.org:maven2/release/org/mortbay/ TO=org/mortbay/ - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/org.objectweb.sh b/maven-meeper/src/bin/m2-sync/conf/org.objectweb.sh similarity index 83% rename from maven-meeper/src/bin/m2-sync/org.objectweb.sh rename to maven-meeper/src/bin/m2-sync/conf/org.objectweb.sh index 46946734dd..756235a960 100755 --- a/maven-meeper/src/bin/m2-sync/org.objectweb.sh +++ b/maven-meeper/src/bin/m2-sync/conf/org.objectweb.sh @@ -2,5 +2,3 @@ FROM=maven@forge.objectweb.org:../../groups/maven/htdocs/maven2/org/objectweb/ TO=org/objectweb/ - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/wicket.sh b/maven-meeper/src/bin/m2-sync/conf/wicket.sh similarity index 83% rename from maven-meeper/src/bin/m2-sync/wicket.sh rename to maven-meeper/src/bin/m2-sync/conf/wicket.sh index 92be9c33a2..5912c4e163 100755 --- a/maven-meeper/src/bin/m2-sync/wicket.sh +++ b/maven-meeper/src/bin/m2-sync/conf/wicket.sh @@ -2,5 +2,3 @@ FROM=carlossg@shell.sourceforge.net:/home/groups/w/wi/wicket/htdocs/maven2/wicket/ TO=wicket/ - -source ./m2-sync.sh diff --git a/maven-meeper/src/bin/m2-sync/m2-sync.sh b/maven-meeper/src/bin/m2-sync/m2-sync.sh index 8fb0dd1634..76ecb7eeed 100755 --- a/maven-meeper/src/bin/m2-sync/m2-sync.sh +++ b/maven-meeper/src/bin/m2-sync/m2-sync.sh @@ -20,19 +20,31 @@ else RSYNC_OPTS="$RSYNC_OPTS -n" fi -cd $HOME/repository-staging/to-ibiblio/maven2 +BASEDIR=$HOME/repository-staging/to-ibiblio/maven2 -# ideally we would use --ignore-existing but we need to copy the metadata files +for f in `find conf -iname "*.sh"` + do -if [ -z $NO_SSH ] -then - if [ -z $SSH_OPTS ] + FROM= + TO= + NO_SSH= + SSH_OPTS= + RSYNC_SSH= + + source $f + + if [ -z $NO_SSH ] then - RSYNC_SSH="-e ssh" - else - RSYNC_SSH="-e \"ssh $SSH_OPTS\"" + if [ -z $SSH_OPTS ] + then + RSYNC_SSH="-e ssh" + else + RSYNC_SSH="-e \"ssh $SSH_OPTS\"" + fi fi -fi -echo "Syncing $FROM -> $TO" -rsync --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt $RSYNC_OPTS -Lcrtivz $RSYNC_SSH $FROM $TO + echo "Syncing $FROM -> $TO" + rsync --include=*/ --include=**/maven-metadata.xml* --exclude=* --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt $RSYNC_OPTS -Lrtivz $RSYNC_SSH $FROM $BASEDIR/$TO + rsync --exclude-from=$HOME/components/maven-meeper/src/bin/syncopate/exclusions.txt --ignore-existing $RSYNC_OPTS -Lrtivz $RSYNC_SSH $FROM $BASEDIR/$TO + +done \ No newline at end of file