svn commit: r629327 - in /maven/archiva/tools/trunk/maven-meeper/src: bin/synchronize/m2-sync/sync.properties main/java/org/apache/maven/archiva/meeper/Synchronizer.java main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java

[carlos]

Author: carlos
Date: Tue Feb 19 18:55:24 2008
New Revision: 629327

URL: http://svn.apache.org/viewvc?rev=629327&view=rev
Log:
Allow configuration of timeout

Modified:
    
maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties
    
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
    
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java

Modified: 
maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties
URL: 
http://svn.apache.org/viewvc/maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties?rev=629327&r1=629326&r2=629327&view=diff
==============================================================================
--- 
maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties
 (original)
+++ 
maven/archiva/tools/trunk/maven-meeper/src/bin/synchronize/m2-sync/sync.properties
 Tue Feb 19 18:55:24 2008
@@ -1,6 +1,9 @@
 # any other value will make it run the sync without actually copying files 
 dryRun=false
 
+# Timeout for each repo in minutes, default=10
+#timeout=10
+
 exclusionsFile=/home/maven/bin/synchronize/syncopate/exclusions.txt
 basedir=/home/maven/repository-staging/to-ibiblio/maven2
 log=/tmp/sync-changed.log

Modified: 
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java?rev=629327&r1=629326&r2=629327&view=diff
==============================================================================
--- 
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
 (original)
+++ 
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/Synchronizer.java
 Tue Feb 19 18:55:24 2008
@@ -28,9 +28,6 @@
 
     private static final String DRY_RUN = "-n";
 
-    /** timeout in seconds for each repo */
-    private static final int TIMEOUT = 5 * 60;
-
     private SynchronizerOptions options;
 
     private List failedRepositories = new ArrayList();
@@ -159,7 +156,7 @@
         int exitCode;
         try
         {
-            exitCode = CommandLineUtils.executeCommandLine( cl, out, err, 
TIMEOUT );
+            exitCode = CommandLineUtils.executeCommandLine( cl, out, err, 
options.getTimeout() * 60 );
         }
         catch ( CommandLineException e )
         {

Modified: 
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
URL: 
http://svn.apache.org/viewvc/maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java?rev=629327&r1=629326&r2=629327&view=diff
==============================================================================
--- 
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
 (original)
+++ 
maven/archiva/tools/trunk/maven-meeper/src/main/java/org/apache/maven/archiva/meeper/SynchronizerOptions.java
 Tue Feb 19 18:55:24 2008
@@ -26,6 +26,8 @@
 
     private static final String MAIL_FOOTER = "mailFooter";
 
+    private static final String TIMEOUT = "timeout";
+
     private String exclusionsFile;
 
     private String basedir;
@@ -36,6 +38,8 @@
 
     private String mailHostname, mailTo, mailFrom, mailSubject, mailFooter;
 
+    private int timeout = 10;
+
     public String getExclusionsFile()
     {
         return exclusionsFile;
@@ -118,6 +122,12 @@
             options.setDryRun( false );
         }
 
+        String timeoutString = properties.getProperty( TIMEOUT );
+        if ( timeoutString != null )
+        {
+            options.setTimeout( Integer.parseInt( timeoutString ) );
+        }
+
         options.setExclusionsFile( properties.getProperty( EXCLUSIONS_FILE ) );
         options.setLogFile( properties.getProperty( LOG_FILE ) );
         options.setBasedir( properties.getProperty( BASEDIR ) );
@@ -177,5 +187,18 @@
     public String getMailFooter()
     {
         return mailFooter;
+    }
+
+    public void setTimeout( int timeout )
+    {
+        this.timeout = timeout;
+    }
+
+    /**
+     * Timeout for each repo in minutes
+     */
+    public int getTimeout()
+    {
+        return timeout;
     }
 }