Author: carlos
Date: Thu Nov 16 01:20:19 2006
New Revision: 475654
URL: http://svn.apache.org/viewvc?view=rev&rev=475654
Log:
Less error prone way to define the repote repos to sync from
Added:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.databinder.sh.disabled
- copied unchanged from r473613,
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.databinder.sh
Removed:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.databinder.sh
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/ch.qos.logback.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/codehaus.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/displaytag.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.dtddoc.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.mapasuta.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.jwebunit.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.maven-taglib.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.openutils.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.acegisecurity.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.apache.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.mortbay.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.objectweb.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.slf4j.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.springframework.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/wicket.sh
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/m2-sync.sh
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/ch.qos.logback.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/ch.qos.logback.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/ch.qos.logback.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/ch.qos.logback.sh
Thu Nov 16 01:20:19 2006
@@ -3,7 +3,7 @@
# Sebastien Pennec [EMAIL PROTECTED]
# Ceki Gulcu [EMAIL PROTECTED]
-FROM=rsync://pixie.qos.ch/mvnrepo/ch/qos/logback
-TO=ch/qos/logback
+FROM=rsync://pixie.qos.ch/mvnrepo
+GROUP_DIR=ch/qos/logback
NO_SSH=true
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/codehaus.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/codehaus.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/codehaus.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/codehaus.sh
Thu Nov 16 01:20:19 2006
@@ -1,7 +1,7 @@
#!/bin/sh
[EMAIL PROTECTED]:/repository/
-TO=./
[EMAIL PROTECTED]:/repository
+GROUP_DIR=./
SSH_OPTS="-i $HOME/.ssh/new-id_dsa"
#RSYNC_OPTS="-L"
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/displaytag.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/displaytag.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/displaytag.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/displaytag.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL PROTECTED]:/home/groups/d/di/displaytag/htdocs/m2repo/displaytag/
-TO=displaytag/
[EMAIL PROTECTED]:/home/groups/d/di/displaytag/htdocs/m2repo
+GROUP_DIR=displaytag/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.dtddoc.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.dtddoc.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.dtddoc.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.dtddoc.sh
Thu Nov 16 01:20:19 2006
@@ -2,5 +2,5 @@
# Hervé BOUTEMY [EMAIL PROTECTED]
[EMAIL PROTECTED]:/home/groups/d/dt/dtddoc/htdocs/m2repo/releases/net/sf/dtddoc/
-TO=net/sf/dtddoc/
[EMAIL PROTECTED]:/home/groups/d/dt/dtddoc/htdocs/m2repo/releases
+GROUP_DIR=net/sf/dtddoc/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.mapasuta.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.mapasuta.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.mapasuta.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sf.mapasuta.sh
Thu Nov 16 01:20:19 2006
@@ -2,5 +2,5 @@
# Contact: [EMAIL PROTECTED]
[EMAIL PROTECTED]:/home/groups/m/ma/mapasuta/maven/upload-repo/net/sf/mapasuta/
-TO=net/sf/mapasuta/
[EMAIL PROTECTED]:/home/groups/m/ma/mapasuta/maven/upload-repo
+GROUP_DIR=net/sf/mapasuta/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.jwebunit.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.jwebunit.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.jwebunit.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.jwebunit.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL
PROTECTED]:/home/groups/j/jw/jwebunit/htdocs/m2-repo/net/sourceforge/jwebunit/
-TO=net/sourceforge/jwebunit/
[EMAIL PROTECTED]:/home/groups/j/jw/jwebunit/htdocs/m2-repo
+GROUP_DIR=net/sourceforge/jwebunit/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.maven-taglib.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.maven-taglib.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.maven-taglib.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.maven-taglib.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL
PROTECTED]:/home/groups/m/ma/maven-taglib/htdocs/m2repo/net/sourceforge/maven-taglib/
-TO=net/sourceforge/maven-taglib/
[EMAIL PROTECTED]:/home/groups/m/ma/maven-taglib/htdocs/m2repo
+GROUP_DIR=net/sourceforge/maven-taglib/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.openutils.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.openutils.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.openutils.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/net.sourceforge.openutils.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL
PROTECTED]:/home/groups/o/op/openutils/htdocs/repository/releases/net/sourceforge/openutils/
-TO=net/sourceforge/openutils/
[EMAIL PROTECTED]:/home/groups/o/op/openutils/htdocs/repository/releases
+GROUP_DIR=net/sourceforge/openutils/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.acegisecurity.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.acegisecurity.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.acegisecurity.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.acegisecurity.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL
PROTECTED]:/home/groups/a/ac/acegisecurity/htdocs/repository/releases/org/acegisecurity/
-TO=org/acegisecurity/
[EMAIL PROTECTED]:/home/groups/a/ac/acegisecurity/htdocs/repository/releases
+GROUP_DIR=org/acegisecurity/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.apache.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.apache.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.apache.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.apache.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL
PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository/org/apache/
-TO=org/apache/
[EMAIL PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository
+GROUP_DIR=org/apache/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.mortbay.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.mortbay.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.mortbay.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.mortbay.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL PROTECTED]:maven2/release/org/mortbay/
-TO=org/mortbay/
[EMAIL PROTECTED]:maven2/release
+GROUP_DIR=org/mortbay/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.objectweb.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.objectweb.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.objectweb.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.objectweb.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL PROTECTED]:../../groups/maven/htdocs/maven2/org/objectweb/
-TO=org/objectweb/
[EMAIL PROTECTED]:../../groups/maven/htdocs/maven2
+GROUP_DIR=org/objectweb/
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.slf4j.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.slf4j.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.slf4j.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.slf4j.sh
Thu Nov 16 01:20:19 2006
@@ -2,7 +2,7 @@
# Ceki Gulcu [EMAIL PROTECTED]
-FROM=rsync://pixie.qos.ch/mvnrepo/org/slf4j
-TO=org/slf4j
+FROM=rsync://pixie.qos.ch/mvnrepo
+GROUP_DIR=org/slf4j
NO_SSH=true
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.springframework.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.springframework.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
---
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.springframework.sh
(original)
+++
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/org.springframework.sh
Thu Nov 16 01:20:19 2006
@@ -1,6 +1,6 @@
#!/bin/sh
-FROM=/home/maven/repository-staging/to-ibiblio/maven-spring/org/springframework/
-TO=org/springframework/
+FROM=/home/maven/repository-staging/to-ibiblio/maven-spring
+GROUP_DIR=org/springframework/
-svn up $FROM
\ No newline at end of file
+svn up $FROM/$GROUP_DIR
\ No newline at end of file
Modified:
maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/wicket.sh
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/wicket.sh?view=diff&rev=475654&r1=475653&r2=475654
==============================================================================
--- maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/wicket.sh
(original)
+++ maven/archiva/trunk/maven-meeper/src/bin/synchronize/m2-sync/conf/wicket.sh
Thu Nov 16 01:20:19 2006
@@ -1,4 +1,4 @@
#!/bin/sh
[EMAIL PROTECTED]:/home/groups/w/wi/wicket/htdocs/maven2/wicket/
-TO=wicket/
[EMAIL PROTECTED]:/home/groups/w/wi/wicket/htdocs/maven2
+GROUP_DIR=wicket/
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=475654&r1=475653&r2=475654
==============================================================================
--- 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 Thu
Nov 16 01:20:19 2006
@@ -31,7 +31,7 @@
do
FROM=
- TO=
+ GROUP_DIR=
NO_SSH=
SSH_OPTS=
# to prevent empty variable
@@ -47,13 +47,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 $BASEDIR/$TO >> $CHANGED_LOG
+ 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
else
- echo "Syncing $FROM -> $TO"
- 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 $BASEDIR/$TO
- rsync
--exclude-from=$HOME/components/maven-meeper/src/bin/synchronize/syncopate/exclusions.txt
--ignore-existing $RSYNC_OPTS -Lrtivz "$RSYNC_SSH" $FROM $BASEDIR/$TO
+ 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
fi
