You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/02/20 23:48:13 UTC
cvs commit: avalon/repository/impl/src/java/org/apache/avalon/repository/impl DefaultRepositoryCriteria.properties DefaultRepositoryCriteria.java
mcconnell 2004/02/20 14:48:13
Modified: repository/impl/src/java/org/apache/avalon/repository/impl
DefaultRepositoryCriteria.java
Added: repository/impl/src/java/org/apache/avalon/repository/impl
DefaultRepositoryCriteria.properties
Log:
Improve artificate toString handling and upgrade the repository criteria to use the improved defaults management.
Revision Changes Path
1.6 +6 -7 avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepositoryCriteria.java
Index: DefaultRepositoryCriteria.java
===================================================================
RCS file: /home/cvs/avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepositoryCriteria.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultRepositoryCriteria.java 19 Feb 2004 12:25:29 -0000 1.5
+++ DefaultRepositoryCriteria.java 20 Feb 2004 22:48:13 -0000 1.6
@@ -117,10 +117,10 @@
final String key = context.getApplicationKey();
final File work = context.getInitialWorkingDirectory();
- Properties bootstrap = getDefaultProperties();
+ Properties defaults = getDefaultProperties();
DefaultsBuilder builder = new DefaultsBuilder( key, work );
Properties properties =
- builder.getConsolidatedProperties( bootstrap, SINGLE_KEYS );
+ builder.getConsolidatedProperties( defaults, SINGLE_KEYS );
//
// Populate the empty repository criteria using
@@ -172,14 +172,13 @@
{
try
{
- return Defaults.getStaticProperties(
- DefaultRepositoryCriteria.class, DEFAULTS );
+ return Defaults.getStaticProperties( DefaultRepositoryCriteria.class );
}
catch ( IOException e )
{
throw new RepositoryException(
- "Failed to load implementation defaults resource: "
- + DEFAULTS, e );
+ "Failed to load implementation defaults resource for the class: "
+ + DefaultRepositoryCriteria.class.getName(), e );
}
}
}
1.1 avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepositoryCriteria.properties
Index: DefaultRepositoryCriteria.properties
===================================================================
#
# Static defaults for the avalon-repository implementation
# criteria.
#
avalon.repository.hosts = http://dpml.net,http://ibiblio.org/maven
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org