Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Updated the code for escaping/unescaping cron expressions in DefaultArchivaConfiguration as the escape character '\' is displayed in the 

repositories.jsp 



git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@568146 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maria Odea B. Ching 2007-08-21 14:35:15 +00:00
parent 8ffe658623
commit d00a9c7e1b
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
archiva-base/archiva-configuration/src/main/java/org/apache/maven/archiva/configuration/DefaultArchivaConfiguration.java
View File

@ -95,10 +95,9 @@ public class DefaultArchivaConfiguration
if ( configuration == null )
{
configuration = load();
configuration = processExpressions( configuration );
}
configuration = processExpressions( configuration );
return configuration;
}
@ -178,12 +177,23 @@ public class DefaultArchivaConfiguration
}
}
configuration = escapeCronExpressions( configuration );
// escape all cron expressions to handle ','
for ( Iterator i = configuration.getRepositories().iterator(); i.hasNext(); )
{
RepositoryConfiguration c = (RepositoryConfiguration) i.next();
c.setRefreshCronExpression( escapeCronExpression( c.getRefreshCronExpression() ) );
}
if ( configuration.getDatabaseScanning() != null )
{
configuration.getDatabaseScanning().setCronExpression( escapeCronExpression(
configuration.getDatabaseScanning().getCronExpression() ) );
}
new ConfigurationRegistryWriter().write( configuration, section );
section.save();
this.configuration = configuration;
this.configuration = processExpressions( configuration );
}
private Registry createDefaultConfigurationFile()
@ -295,24 +305,4 @@ public class DefaultArchivaConfiguration
return config;
}
private Configuration escapeCronExpressions( Configuration config )
{
for ( Iterator i = config.getRepositories().iterator(); i.hasNext(); )
{
RepositoryConfiguration c = (RepositoryConfiguration) i.next();
c.setRefreshCronExpression( escapeCronExpression( c.getRefreshCronExpression() ) );
}
DatabaseScanningConfiguration databaseScanning = config.getDatabaseScanning();
if ( databaseScanning != null )
{
String cron = databaseScanning.getCronExpression();
databaseScanning.setCronExpression( escapeCronExpression( cron ) );
}
return config;
}
}