Author: epunzalan
Date: Tue Jun 13 20:48:25 2006
New Revision: 414043
URL: http://svn.apache.org/viewvc?rev=414043&view=rev
Log:
moved configuration validations inside the configuration object
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/MavenProxyPropertyLoader.java
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/MavenProxyPropertyLoader.java
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/MavenProxyPropertyLoader.java?rev=414043&r1=414042&r2=414043&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/MavenProxyPropertyLoader.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/MavenProxyPropertyLoader.java
Tue Jun 13 20:48:25 2006
@@ -20,12 +20,10 @@
import org.apache.maven.repository.proxy.repository.ProxyRepository;
import org.codehaus.plexus.util.StringUtils;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
@@ -116,26 +114,11 @@
config.setRepositories( repositories );
- validateDirectories( config );
- validateRemoteRepo( config );
+ config.validate();
return config;
}
- /**
- * @todo should be shared with any other configuration loader - move
method to configuration?
- */
- private static void validateRemoteRepo( ProxyConfiguration configuration )
- throws ValidationException
- {
- //Verify remote repository set
- //only warn if missing
- if ( configuration.getRepositories().size() < 1 )
- {
- throw new ValidationException( "At least one remote repository
must be configured." );
- }
- }
-
private Properties getSubset( Properties props, String prefix )
{
Enumeration keys = props.keys();
@@ -173,31 +156,4 @@
return value;
}
-
- /**
- * @todo should be shared with any other configuration loader - move
method to configuration?
- */
- private static void validateDirectories( ProxyConfiguration configuration )
- throws ValidationException
- {
- File f = new File( configuration.getRepositoryCachePath() );
- if ( !f.exists() )
- {
- throw new ValidationException( "Specified directory does not
exist: " + f.getAbsolutePath() );
- }
-
- for ( Iterator repos = configuration.getRepositories().iterator();
repos.hasNext(); )
- {
- ProxyRepository repo = (ProxyRepository) repos.next();
- if ( repo.getUrl().startsWith( "file://" ) )
- {
- File f2 = new File( repo.getBasedir() );
- if ( !f2.exists() )
- {
- throw new ValidationException( "Specified directory does
not exist: " + f2.getAbsolutePath() );
- }
- }
- }
- }
-
}
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java?rev=414043&r1=414042&r2=414043&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/configuration/ProxyConfiguration.java
Tue Jun 13 20:48:25 2006
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.Iterator;
/**
* Class to represent the configuration file for the proxy
@@ -140,5 +141,46 @@
public void setLayout( String layout )
{
this.layout = layout;
+ }
+
+ public void validate()
+ throws ValidationException
+ {
+ validateRemoteRepo();
+ validateDirectories();
+ }
+
+ private void validateRemoteRepo( )
+ throws ValidationException
+ {
+ //Verify remote repository set
+ //only warn if missing
+ if ( getRepositories().size() < 1 )
+ {
+ throw new ValidationException( "At least one remote repository
must be configured." );
+ }
+ }
+
+ private void validateDirectories()
+ throws ValidationException
+ {
+ File f = new File( getRepositoryCachePath() );
+ if ( !f.exists() )
+ {
+ throw new ValidationException( "Specified directory does not
exist: " + f.getAbsolutePath() );
+ }
+
+ for ( Iterator repos = getRepositories().iterator(); repos.hasNext(); )
+ {
+ ProxyRepository repo = (ProxyRepository) repos.next();
+ if ( repo.getUrl().startsWith( "file://" ) )
+ {
+ File f2 = new File( repo.getBasedir() );
+ if ( !f2.exists() )
+ {
+ throw new ValidationException( "Specified directory does
not exist: " + f2.getAbsolutePath() );
+ }
+ }
+ }
}
}
