o create configuration directories for m1 and m2 syncs, and preserve the behavior...

  this for m2 syncs before the MRSK is complete.

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

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/apache.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/apache.conf
deleted file mode 100644 (file)
index 33f9d6d..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/apache.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[info]
-id = apache
-name = Apache Software Foundation
-#contact = repository@apache.org 
-contact = carlos@apache.org
-
-[host]
-address=people.apache.org
-directory=/www/people.apache.org/repo/m1-ibiblio-rsync-repository
-rsyncUser=jvanzyl

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/codehaus.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/codehaus.conf
deleted file mode 100644 (file)
index 002d7fb..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/codehaus.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[info]
-id = codehaus
-name = Codehaus
-contact = carlos@apache.org
-
-[host]
-address=repository.codehaus.org
-directory=/dist
-rsyncUser=mavensync
-identity=/home/maven/.ssh/new-id_dsa

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/apache.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/apache.conf
new file mode 100644 (file)
index 0000000..33f9d6d
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/apache.conf
@@ -0,0 +1,10 @@
+[info]
+id = apache
+name = Apache Software Foundation
+#contact = repository@apache.org 
+contact = carlos@apache.org
+
+[host]
+address=people.apache.org
+directory=/www/people.apache.org/repo/m1-ibiblio-rsync-repository
+rsyncUser=jvanzyl

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/codehaus.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/codehaus.conf
new file mode 100644 (file)
index 0000000..002d7fb
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/codehaus.conf
@@ -0,0 +1,10 @@
+[info]
+id = codehaus
+name = Codehaus
+contact = carlos@apache.org
+
+[host]
+address=repository.codehaus.org
+directory=/dist
+rsyncUser=mavensync
+identity=/home/maven/.ssh/new-id_dsa

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/maven-plugins-sf.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/maven-plugins-sf.conf
new file mode 100644 (file)
index 0000000..a776847
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/maven-plugins-sf.conf
@@ -0,0 +1,10 @@
+[info]
+id = maven-plugins-sf
+name = Maven Plugins @ SourceForge
+#contact = maven-plugins-developer@lists.sourceforge.net
+contact = carlos@apache.org
+
+[host]
+address=shell.sourceforge.net
+directory=/home/groups/m/ma/maven-plugins/htdocs/repository
+rsyncUser=brettporter

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/mortbay.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/mortbay.conf
new file mode 100644 (file)
index 0000000..cd875cb
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/mortbay.conf
@@ -0,0 +1,8 @@
+[info]
+id = mortbay
+name = Mortbay Consulting
+contact = gregw@mortbay.com
+
+[host]
+address=jetty.mortbay.org
+directory=maven

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/objectweb.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/objectweb.conf
new file mode 100644 (file)
index 0000000..2adad89
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/objectweb.conf
@@ -0,0 +1,9 @@
+[info]
+id = objectweb
+name = ObjectWeb
+contact = xavier.moghrabi@objectweb.org
+
+[host]
+address=forge.objectweb.org
+directory=../../groups/maven/htdocs/maven1
+rsyncUser=maven

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/opensymphony.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/opensymphony.conf
new file mode 100644 (file)
index 0000000..eac6679
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/opensymphony.conf
@@ -0,0 +1,10 @@
+[info]
+id = opensymphony
+name = Open Symphony
+#contact = christopher.pearson@formicary.net
+contact = carlos@apache.org
+
+[host]
+address=opensymphony.com
+directory=/home/ibiblio/repository
+rsyncUser=ibiblio

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/osjava.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/osjava.conf
new file mode 100644 (file)
index 0000000..d1ed675
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/osjava.conf
@@ -0,0 +1,9 @@
+[info]
+id = osjava
+name = OS Java
+contact = bayard@generationjava.com 
+
+[host]
+address=www.osjava.org
+directory=/home/sites/org.osjava/dist/maven
+options=--exclude=".svn" --exclude="README.txt" --exclude="_templates"

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/stage.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/stage.conf
new file mode 100644 (file)
index 0000000..6fb7fd9
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/stage.conf
@@ -0,0 +1,10 @@
+[info]
+id = ibiblio
+name = Ibiblio staging area
+contact = jason@maven.org
+batchDisabled = true
+
+[host]
+address=beaver.codehaus.org
+directory=~/ibiblio-sync/repository
+rsyncUser=maven

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/m1/test.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/test.conf
new file mode 100644 (file)
index 0000000..a423c9f
--- /dev/null
+++ b/maven-meeper/src/bin/synchronize/syncopate/conf/m1/test.conf
@@ -0,0 +1,12 @@
+[info]
+id = codehaus
+name = Codehaus
+contact = jason@maven.org
+batchDisabled = true
+
+[host]
+address=beaver.codehaus.org
+#directory=~/testRepo
+directory=/dist
+rsyncUser=rsync
+repoDirectory=testRepo

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/maven-plugins-sf.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/maven-plugins-sf.conf
deleted file mode 100644 (file)
index a776847..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/maven-plugins-sf.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[info]
-id = maven-plugins-sf
-name = Maven Plugins @ SourceForge
-#contact = maven-plugins-developer@lists.sourceforge.net
-contact = carlos@apache.org
-
-[host]
-address=shell.sourceforge.net
-directory=/home/groups/m/ma/maven-plugins/htdocs/repository
-rsyncUser=brettporter

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/mortbay.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/mortbay.conf
deleted file mode 100644 (file)
index cd875cb..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/mortbay.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[info]
-id = mortbay
-name = Mortbay Consulting
-contact = gregw@mortbay.com
-
-[host]
-address=jetty.mortbay.org
-directory=maven

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/objectweb.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/objectweb.conf
deleted file mode 100644 (file)
index 2adad89..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/objectweb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[info]
-id = objectweb
-name = ObjectWeb
-contact = xavier.moghrabi@objectweb.org
-
-[host]
-address=forge.objectweb.org
-directory=../../groups/maven/htdocs/maven1
-rsyncUser=maven

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/opensymphony.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/opensymphony.conf
deleted file mode 100644 (file)
index eac6679..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/opensymphony.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[info]
-id = opensymphony
-name = Open Symphony
-#contact = christopher.pearson@formicary.net
-contact = carlos@apache.org
-
-[host]
-address=opensymphony.com
-directory=/home/ibiblio/repository
-rsyncUser=ibiblio

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/osjava.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/osjava.conf
deleted file mode 100644 (file)
index d1ed675..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/osjava.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[info]
-id = osjava
-name = OS Java
-contact = bayard@generationjava.com 
-
-[host]
-address=www.osjava.org
-directory=/home/sites/org.osjava/dist/maven
-options=--exclude=".svn" --exclude="README.txt" --exclude="_templates"

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/stage.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/stage.conf
deleted file mode 100644 (file)
index 6fb7fd9..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/stage.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[info]
-id = ibiblio
-name = Ibiblio staging area
-contact = jason@maven.org
-batchDisabled = true
-
-[host]
-address=beaver.codehaus.org
-directory=~/ibiblio-sync/repository
-rsyncUser=maven

diff --git a/maven-meeper/src/bin/synchronize/syncopate/conf/test.conf b/maven-meeper/src/bin/synchronize/syncopate/conf/test.conf
deleted file mode 100644 (file)
index a423c9f..0000000
--- a/maven-meeper/src/bin/synchronize/syncopate/conf/test.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[info]
-id = codehaus
-name = Codehaus
-contact = jason@maven.org
-batchDisabled = true
-
-[host]
-address=beaver.codehaus.org
-#directory=~/testRepo
-directory=/dist
-rsyncUser=rsync
-repoDirectory=testRepo

diff --git a/maven-meeper/src/bin/synchronize/syncopate/sync b/maven-meeper/src/bin/synchronize/syncopate/sync
index e594af446ddd8c8bbce5c948263f90a086ed6755..002d9dc0b0f402f867fc39e54da16d6ce36a2c13 100755 (executable)
--- a/maven-meeper/src/bin/synchronize/syncopate/sync
+++ b/maven-meeper/src/bin/synchronize/syncopate/sync
@@ -22,7 +22,7 @@ my $reportUrl = $configuration->val( "syncopate", "reportUrl" );
 
 if ( defined( $ARGV[0] ) )
 {
-    my $sourceConfiguration = new Config::IniFiles( -file => "conf/$ARGV[0]" . ".conf" );
+    my $sourceConfiguration = new Config::IniFiles( -file => "conf/m1/$ARGV[0]" . ".conf" );
     
     syncSource( $sourceConfiguration );
 }
@@ -37,7 +37,7 @@ else
 # -----------------------------------------------------------------------------
 sub syncSources
 {
-    my @sources = glob( "conf/*.conf" );
+    my @sources = glob( "conf/m1/*.conf" );
 
     for my $source (@sources) 
     {