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 2003/12/14 18:01:46 UTC
cvs commit: avalon/repository/main/src/java/org/apache/avalon/repository/main AbstractBuilder.java DefaultInitialContext.java
mcconnell 2003/12/14 09:01:46
Modified: repository/main/src/java/org/apache/avalon/repository/main
AbstractBuilder.java DefaultInitialContext.java
Log:
Updates to handle simplified imple spec. handling.
Revision Changes Path
1.4 +5 -5 avalon/repository/main/src/java/org/apache/avalon/repository/main/AbstractBuilder.java
Index: AbstractBuilder.java
===================================================================
RCS file: /home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/AbstractBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractBuilder.java 8 Dec 2003 08:29:18 -0000 1.3
+++ AbstractBuilder.java 14 Dec 2003 17:01:46 -0000 1.4
@@ -108,13 +108,13 @@
}
/**
- * Create a factory delegate using a supplied class and command line arguemnts.
+ * <p>Create a factory delegate using a supplied class and command line arguemnts.
* The implementation will conduct an ordered search for a constructor matching
- * one of the four standard constructor patterns.
+ * one of the four standard constructor patterns.</p>
* <ul>
- * <li>[FactoryClass]( InitialContext context, String[] args )</li>
+ * <li>[FactoryClass]( InitialContext context, ClassLoader loader )</li>
* <li>[FactoryClass]( InitialContext context )</li>
- * <li>[FactoryClass]( String[] args )</li>
+ * <li>[FactoryClass]( ClassLoader loader )</li>
* <li>[FactoryClass]( )</li>
* </ul>
*
1.11 +7 -16 avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java
Index: DefaultInitialContext.java
===================================================================
RCS file: /home/cvs/avalon/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DefaultInitialContext.java 14 Dec 2003 11:56:33 -0000 1.10
+++ DefaultInitialContext.java 14 Dec 2003 17:01:46 -0000 1.11
@@ -154,7 +154,7 @@
//------------------------------------------------------------------
private static final String AVALON_IMPL_PROPERTIES =
- "avalon.implementation";
+ "avalon.properties";
private static final File USER_HOME =
new File( System.getProperty( "user.home" ) );
@@ -466,23 +466,14 @@
private static Artifact getDefaultImplementation()
{
Properties properties = createDefaultProperties();
- final String group =
- properties.getProperty( Artifact.GROUP_KEY );
- final String name =
- properties.getProperty( Artifact.NAME_KEY );
- final String version =
- properties.getProperty( Artifact.VERSION_KEY );
-
- try
- {
- return Artifact.createArtifact( group, name, version );
- }
- catch( Throwable e )
+ String spec = properties.getProperty( "avalon.repository.implementation" );
+ if( null == spec )
{
- final String error =
- "Internal error while attempting to build default implementation artifact.";
- throw new RepositoryRuntimeException( error, e );
+ final String error =
+ "Missing avalon.properties resource.";
+ throw new IllegalStateException( error );
}
+ return Artifact.createArtifact( spec );
}
private File setupBaseDirectory( File base )
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org