mcconnell 2003/11/29 23:06:10
Modified: repository/main/src/java/org/apache/avalon/repository/main
DefaultBuilder.java DefaultInitialContext.java
Log:
Switch argument order in DefaultInitialContext.
Revision Changes Path
1.2 +2 -11
avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/DefaultBuilder.java
Index: DefaultBuilder.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/DefaultBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultBuilder.java 30 Nov 2003 05:49:32 -0000 1.1
+++ DefaultBuilder.java 30 Nov 2003 07:06:10 -0000 1.2
@@ -152,15 +152,6 @@
try
{
Factory factory = m_context.getInitialFactory();
- //Map criteria = factory.createDefaultCriteria();
-
- //String[] hosts = context.getInitialHosts();
- //criteria.put( "avalon.repository.remote.url", hosts );
-
- //File cache = context.getInitialCacheDirectory();
- //criteria.put( "avalon.home", cache );
-
- //m_repository = (Repository) factory.create( criteria );
m_repository = (Repository) factory.create();
System.out.println( "Repository: " + m_repository );
}
@@ -248,7 +239,7 @@
try
{
- InitialContext context = new DefaultInitialContext( hosts, cache );
+ InitialContext context = new DefaultInitialContext( cache, hosts );
System.out.println( "Building: " + artifact );
Builder builder = new DefaultBuilder( context, artifact, args );
Object object = builder.getFactory().create();
1.2 +6 -19
avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java
Index: DefaultInitialContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/main/src/java/org/apache/avalon/repository/main/DefaultInitialContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultInitialContext.java 30 Nov 2003 05:49:32 -0000 1.1
+++ DefaultInitialContext.java 30 Nov 2003 07:06:10 -0000 1.2
@@ -143,7 +143,7 @@
public DefaultInitialContext( String[] hosts )
throws RepositoryException
{
- this( hosts, null );
+ this( null, hosts );
}
/**
@@ -153,35 +153,22 @@
* @param cache the cache directory
* @throws RepositoryException if an error occurs during establishment
*/
- public DefaultInitialContext( String[] hosts, File cache )
+ public DefaultInitialContext( File cache, String[] hosts )
throws RepositoryException
{
- this( null, hosts, cache );
- }
-
- /**
- * Creates an initial repository context.
- *
- * @param artifact an artifact that references the repository implementation
- * @param hosts a set of initial remote repository addresses
- * @throws RepositoryException if an error occurs during establishment
- */
- public DefaultInitialContext( Artifact artifact, String[] hosts )
- throws RepositoryException
- {
- this( artifact, hosts, null );
+ this( null, cache, hosts );
}
/**
* Creates an initial repository context.
*
* @param artifact an artifact referencing the default implementation
- * @param hosts a set of initial remote repository addresses
* @param cache the cache directory
+ * @param hosts a set of initial remote repository addresses
* @throws RepositoryException if an error occurs during establishment
*/
public DefaultInitialContext(
- Artifact artifact, String[] hosts, File cache )
+ Artifact artifact, File cache, String[] hosts )
throws RepositoryException
{
m_cache = setupCache( cache );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
