mcconnell 2003/11/17 00:16:15
Modified: repository/impl/src/java/org/apache/avalon/repository/impl
ArtifactDatabaseImpl.java
DefaultFileRepository.java
Log:
Move some aguments from ArtifactDescriptor to Artifact.
Revision Changes Path
1.3 +9 -8
avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/ArtifactDatabaseImpl.java
Index: ArtifactDatabaseImpl.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/ArtifactDatabaseImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ArtifactDatabaseImpl.java 11 Nov 2003 03:15:29 -0000 1.2
+++ ArtifactDatabaseImpl.java 17 Nov 2003 08:16:15 -0000 1.3
@@ -54,15 +54,17 @@
import java.util.HashMap ;
import java.net.URL;
import java.text.ParseException ;
+import java.util.Properties;
import javax.naming.NamingException ;
import javax.naming.directory.Attribute ;
import javax.naming.directory.Attributes ;
-import org.apache.avalon.repository.RepositoryUtils ;
import org.apache.avalon.repository.ArtifactDatabase ;
+import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.ArtifactDescriptor ;
import org.apache.avalon.repository.RepositoryException ;
+import org.apache.avalon.repository.RepositoryUtils ;
/**
@@ -87,7 +89,6 @@
/** not used but we can cache properties rather than dl everytime */
private final HashMap m_artifactAttributeCache = new HashMap() ;
-
/**
* Creates an artifact database for a set of replicated remote repositories.
*
@@ -119,11 +120,11 @@
* @see org.apache.avalon.repository.ArtifactDatabase#
* getArtifactAttributes(org.apache.avalon.repository.ArtifactDescriptor)
*/
- public Attributes getArtifactAttributes( ArtifactDescriptor a_descriptor )
+ public Attributes getArtifactAttributes( Artifact a_descriptor )
throws RepositoryException
{
- return RepositoryUtils.getAsAttributes( RepositoryUtils
- .getProperties( m_remoteRepoBase, a_descriptor ) ) ;
+ return RepositoryUtils.getAsAttributes(
+ RepositoryUtils.getProperties( m_remoteRepoBase, a_descriptor ) ) ;
}
@@ -131,8 +132,8 @@
* @see org.apache.avalon.repository.ArtifactDatabase#
* getDependencies(org.apache.avalon.repository.ArtifactDescriptor)
*/
- public ArtifactDescriptor [] getDependencies(
- ArtifactDescriptor a_descriptor ) throws RepositoryException
+ public ArtifactDescriptor [] getDependencies( Artifact a_descriptor )
+ throws RepositoryException
{
String l_spec = null ;
ArtifactDescriptor [] l_dependencies = null ;
1.10 +51 -50
avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFileRepository.java
Index: DefaultFileRepository.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFileRepository.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultFileRepository.java 12 Nov 2003 07:21:17 -0000 1.9
+++ DefaultFileRepository.java 17 Nov 2003 08:16:15 -0000 1.10
@@ -48,32 +48,33 @@
*/
-package org.apache.avalon.repository.impl ;
+package org.apache.avalon.repository.impl;
-import java.io.File ;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.ArrayList ;
+import java.util.ArrayList;
import java.util.Enumeration;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.net.JarURLConnection;
-import java.net.URL ;
-import java.net.Authenticator ;
-import java.net.URLClassLoader ;
+import java.net.URL;
+import java.net.Authenticator;
+import java.net.URLClassLoader;
-import javax.naming.directory.Attributes ;
+import javax.naming.directory.Attributes;
import org.apache.avalon.repository.BlockManifest;
-import org.apache.avalon.repository.Repository ;
-import org.apache.avalon.repository.ProxyContext ;
-import org.apache.avalon.repository.JarDescriptor ;
-import org.apache.avalon.repository.ArtifactDatabase ;
-import org.apache.avalon.repository.ArtifactDescriptor ;
-import org.apache.avalon.repository.RepositoryException ;
+import org.apache.avalon.repository.Repository;
+import org.apache.avalon.repository.ProxyContext;
+import org.apache.avalon.repository.JarDescriptor;
+import org.apache.avalon.repository.Artifact;
+import org.apache.avalon.repository.ArtifactDatabase;
+import org.apache.avalon.repository.ArtifactDescriptor;
+import org.apache.avalon.repository.RepositoryException;
@@ -101,7 +102,7 @@
private final URL[] m_hosts;
/** The database implementation. */
- private final ArtifactDatabase m_db ;
+ private final ArtifactDatabase m_db;
//------------------------------------------------------------------
// constructor
@@ -166,7 +167,7 @@
}
}
- m_db = new ArtifactDatabaseImpl( m_hosts ) ;
+ m_db = new ArtifactDatabaseImpl( m_hosts );
}
@@ -179,10 +180,10 @@
* @see org.apache.avalon.repository.ArtifactDatabase#
* getArtifactAttributes(org.apache.avalon.repository.ArtifactDescriptor)
*/
- public Attributes getArtifactAttributes( ArtifactDescriptor a_descriptor )
+ public Attributes getArtifactAttributes( Artifact a_descriptor )
throws RepositoryException
{
- return m_db.getArtifactAttributes( a_descriptor ) ;
+ return m_db.getArtifactAttributes( a_descriptor );
}
@@ -191,10 +192,10 @@
* getDependencies(org.apache.avalon.repository.ArtifactDescriptor)
*/
public ArtifactDescriptor []
- getDependencies( ArtifactDescriptor a_descriptor )
+ getDependencies( Artifact a_descriptor )
throws RepositoryException
{
- return m_db.getDependencies( a_descriptor ) ;
+ return m_db.getDependencies( a_descriptor );
}
@@ -209,7 +210,7 @@
*/
public String getLocation()
{
- return m_base.toString() ;
+ return m_base.toString();
}
@@ -223,7 +224,7 @@
throws RepositoryException
{
return getArtifact( a_artifact.getGroup(), a_artifact.getName(),
- a_artifact.getVersion(), a_artifact.getType() ) ;
+ a_artifact.getVersion(), a_artifact.getType() );
}
@@ -239,19 +240,19 @@
public URL getArtifact( final String a_artifact, final String a_version,
final String a_type ) throws RepositoryException
{
- String l_group = null ;
- String l_name = null ;
- int n = a_artifact.indexOf( SEPERATOR ) ;
+ String l_group = null;
+ String l_name = null;
+ int n = a_artifact.indexOf( SEPERATOR );
if( n < 1 )
{
- l_group = a_artifact ;
- l_name = a_artifact ;
+ l_group = a_artifact;
+ l_name = a_artifact;
}
- l_group = a_artifact.substring( 0, n ) ;
- l_name = a_artifact.substring( n + 1 ) ;
- return getArtifact( l_group, l_name, a_version, a_type ) ;
+ l_group = a_artifact.substring( 0, n );
+ l_name = a_artifact.substring( n + 1 );
+ return getArtifact( l_group, l_name, a_version, a_type );
}
@@ -342,11 +343,11 @@
public ClassLoader getClassLoader( JarDescriptor a_descriptor )
throws RepositoryException
{
- ArrayList l_apiJars = new ArrayList() ;
- ArrayList l_spiJars = new ArrayList() ;
- ArrayList l_implJars = new ArrayList() ;
- ArrayList l_others = new ArrayList() ;
- ArtifactDescriptor [] l_descriptors = getDependencies( a_descriptor ) ;
+ ArrayList l_apiJars = new ArrayList();
+ ArrayList l_spiJars = new ArrayList();
+ ArrayList l_implJars = new ArrayList();
+ ArrayList l_others = new ArrayList();
+ ArtifactDescriptor [] l_descriptors = getDependencies( a_descriptor );
/*
* Add all the dependencies of the descriptor argument
@@ -355,24 +356,24 @@
{
if ( "jars" != l_descriptors[ii].getType() )
{
- continue ;
+ continue;
}
if ( l_descriptors[ii].getName().endsWith("api") )
{
- l_apiJars.add( getArtifact( l_descriptors[ii] ) ) ;
+ l_apiJars.add( getArtifact( l_descriptors[ii] ) );
}
else if ( l_descriptors[ii].getName().endsWith("spi") )
{
- l_spiJars.add( getArtifact( l_descriptors[ii] ) ) ;
+ l_spiJars.add( getArtifact( l_descriptors[ii] ) );
}
else if ( l_descriptors[ii].getName().endsWith("impl") )
{
- l_implJars.add( getArtifact( l_descriptors[ii] ) ) ;
+ l_implJars.add( getArtifact( l_descriptors[ii] ) );
}
else
{
- l_others.add( getArtifact( l_descriptors[ii] ) ) ;
+ l_others.add( getArtifact( l_descriptors[ii] ) );
}
}
@@ -381,34 +382,34 @@
*/
if ( a_descriptor.getName().endsWith("api") )
{
- l_apiJars.add( getArtifact( a_descriptor ) ) ;
+ l_apiJars.add( getArtifact( a_descriptor ) );
}
else if ( a_descriptor.getName().endsWith("spi") )
{
- l_spiJars.add( getArtifact( a_descriptor ) ) ;
+ l_spiJars.add( getArtifact( a_descriptor ) );
}
else if ( a_descriptor.getName().endsWith("impl") )
{
- l_implJars.add( getArtifact( a_descriptor ) ) ;
+ l_implJars.add( getArtifact( a_descriptor ) );
}
else
{
- l_others.add( getArtifact( a_descriptor ) ) ;
+ l_others.add( getArtifact( a_descriptor ) );
}
/*
* Build the classloader tiers
*/
- ClassLoader l_topCL = ClassLoader.getSystemClassLoader() ;
+ ClassLoader l_topCL = ClassLoader.getSystemClassLoader();
ClassLoader l_othersCL = new URLClassLoader( (URL [])
- l_others.toArray( new URL[0] ), l_topCL ) ;
+ l_others.toArray( new URL[0] ), l_topCL );
ClassLoader l_apiCL = new URLClassLoader( (URL[])
- l_apiJars.toArray( new URL[0] ), l_othersCL ) ;
+ l_apiJars.toArray( new URL[0] ), l_othersCL );
ClassLoader l_spiCL = new URLClassLoader( (URL[])
- l_spiJars.toArray( new URL[0] ), l_apiCL ) ;
+ l_spiJars.toArray( new URL[0] ), l_apiCL );
ClassLoader l_implCL = new URLClassLoader( (URL[])
- l_implJars.toArray( new URL[0] ), l_spiCL ) ;
- return l_implCL ;
+ l_implJars.toArray( new URL[0] ), l_spiCL );
+ return l_implCL;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
