Author: brett
Date: Wed Feb 7 14:56:33 2007
New Revision: 504728
URL: http://svn.apache.org/viewvc?view=rev&rev=504728
Log:
move sanitize to configuration class
Modified:
maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo
Modified:
maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java?view=diff&rev=504728&r1=504727&r2=504728
==============================================================================
---
maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
(original)
+++
maven/archiva/trunk/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultConfigurationStore.java
Wed Feb 7 14:56:33 2007
@@ -20,7 +20,6 @@
*/
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Reader;
import org.apache.maven.archiva.configuration.io.xpp3.ConfigurationXpp3Writer;
import org.codehaus.plexus.logging.AbstractLogEnabled;
@@ -103,7 +102,7 @@
try
{
configuration = reader.read( fileReader, false );
- sanitizeConfiguration( configuration );
+ configuration.sanitize();
}
catch ( IOException e )
{
@@ -119,27 +118,6 @@
}
}
return configuration;
- }
-
- /**
- * Perform any Upgrades and Adjustments needed to bring configuration up
to the
- * current configuration format.
- *
- * @param config the configuration to upgrade and adjust.
- */
- private void sanitizeConfiguration( Configuration config )
- {
- Iterator it = config.getRepositories().iterator();
- while ( it.hasNext() )
- {
- RepositoryConfiguration repo = (RepositoryConfiguration) it.next();
-
- // Ensure that the repo.urlName is set.
- if ( StringUtils.isEmpty( repo.getUrlName() ) )
- {
- repo.setUrlName( repo.getId() );
- }
- }
}
public void storeConfiguration( Configuration configuration )
Modified:
maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo?view=diff&rev=504728&r1=504727&r2=504728
==============================================================================
--- maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++ maven/archiva/trunk/archiva-configuration/src/main/mdo/configuration.mdo
Wed Feb 7 14:56:33 2007
@@ -133,6 +133,24 @@
return valid;
}
+ /**
+ * Perform any Upgrades and Adjustments needed to bring configuration up
to the
+ * current configuration format.
+ */
+ public void sanitize()
+ {
+ for ( java.util.Iterator i = getRepositories().iterator();
i.hasNext(); )
+ {
+ RepositoryConfiguration repo = (RepositoryConfiguration) i.next();
+
+ // Ensure that the repo.urlName is set.
+ if ( org.codehaus.plexus.util.StringUtils.isEmpty(
repo.getUrlName() ) )
+ {
+ repo.setUrlName( repo.getId() );
+ }
+ }
+ }
+
public RepositoryConfiguration getRepositoryByUrlName( String urlName )
{
for ( java.util.Iterator i = getRepositories().iterator();
i.hasNext(); )
