mcconnell 2003/12/06 15:51:08
Modified: repository platform.xml
repository/api/src/java/org/apache/avalon/repository
Artifact.java
repository/impl project.xml
repository/impl/src/java/org/apache/avalon/repository/impl
DefaultFactory.java DefaultRepository.java
RepositoryCriteria.java
repository/main project.xml
Added: repository/impl/src/java/org/apache/avalon/repository/impl
avalon.properties
Removed: repository/impl/src/java/org/apache/avalon/repository/impl
default.properties
Log:
Sync. with updates to utilities.
Revision Changes Path
1.2 +1 -6 avalon/repository/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/repository/platform.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- platform.xml 4 Dec 2003 19:34:26 -0000 1.1
+++ platform.xml 6 Dec 2003 23:51:07 -0000 1.2
@@ -16,12 +16,7 @@
</dependency>
<dependency>
<groupId>avalon-util</groupId>
- <artifactId>avalon-util-factory-api</artifactId>
- <version>1.0-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-factory-impl</artifactId>
+ <artifactId>avalon-util-criteria</artifactId>
<version>1.0-dev</version>
</dependency>
<dependency>
1.2 +17 -8
avalon/repository/api/src/java/org/apache/avalon/repository/Artifact.java
Index: Artifact.java
===================================================================
RCS file:
/home/cvs/avalon/repository/api/src/java/org/apache/avalon/repository/Artifact.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Artifact.java 4 Dec 2003 19:34:28 -0000 1.1
+++ Artifact.java 6 Dec 2003 23:51:08 -0000 1.2
@@ -219,21 +219,37 @@
// accessors
// ------------------------------------------------------------------------
+ /**
+ * Return the group identifier for this artifact.
+ * @return the group
+ */
public String getGroup()
{
return m_group;
}
+ /**
+ * Return the name of this artifact.
+ * @return the name
+ */
public String getName()
{
return m_name;
}
+ /**
+ * Return the artifact type.
+ * @return the type
+ */
public String getType()
{
return m_type;
}
+ /**
+ * Return the artifact version.
+ * @return the version
+ */
public String getVersion()
{
return m_version;
@@ -264,13 +280,6 @@
buffer.append( ';' ) ;
buffer.append( version ) ;
}
-
- //String type = getType();
- //if( null != type && !type.equals( "jar" ) )
- //{
- // buffer.append( '#' ) ;
- // buffer.append( type ) ;
- //}
return buffer.toString() ;
}
1.2 +5 -10 avalon/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 4 Dec 2003 19:34:30 -0000 1.1
+++ project.xml 6 Dec 2003 23:51:08 -0000 1.2
@@ -31,6 +31,11 @@
</dependency>
<dependency>
<groupId>avalon-util</groupId>
+ <artifactId>avalon-util-criteria</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
<artifactId>avalon-util-defaults</artifactId>
<version>1.1-dev</version>
</dependency>
@@ -47,16 +52,6 @@
<dependency>
<id>excalibur-i18n</id>
<version>1.1</version>
- </dependency>
- <dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-factory-api</artifactId>
- <version>1.0-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-factory-impl</artifactId>
- <version>1.0-dev</version>
</dependency>
</dependencies>
1.2 +2 -2
avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file:
/home/cvs/avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultFactory.java 4 Dec 2003 19:34:32 -0000 1.1
+++ DefaultFactory.java 6 Dec 2003 23:51:08 -0000 1.2
@@ -66,13 +66,13 @@
import org.apache.avalon.util.defaults.DefaultsFinder ;
import org.apache.avalon.util.defaults.SimpleDefaultsFinder ;
import org.apache.avalon.util.defaults.SystemDefaultsFinder ;
-import org.apache.avalon.util.factory.Factory ;
import org.apache.avalon.repository.Repository ;
import org.apache.avalon.repository.RepositoryException ;
import org.apache.avalon.repository.RepositoryRuntimeException;
import org.apache.avalon.repository.provider.InitialContext ;
import org.apache.avalon.repository.provider.CacheManager ;
+import org.apache.avalon.repository.provider.Factory ;
import org.apache.avalon.repository.util.RepositoryUtils ;
import org.apache.avalon.excalibur.i18n.ResourceManager;
1.2 +9 -2
avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepository.java
Index: DefaultRepository.java
===================================================================
RCS file:
/home/cvs/avalon/repository/impl/src/java/org/apache/avalon/repository/impl/DefaultRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultRepository.java 4 Dec 2003 19:34:33 -0000 1.1
+++ DefaultRepository.java 6 Dec 2003 23:51:08 -0000 1.2
@@ -278,7 +278,14 @@
*/
public String toString()
{
- return m_cache.toString();
+ //return m_cache.toString() ;
+ StringBuffer buffer = new StringBuffer( m_cache.toString() );
+ for( int i=0; i<m_hosts.length; i++ )
+ {
+ buffer.append( ", " );
+ buffer.append( m_hosts[i] );
+ }
+ return buffer.toString();
}
//------------------------------------------------------------------
1.3 +44 -34
avalon/repository/impl/src/java/org/apache/avalon/repository/impl/RepositoryCriteria.java
Index: RepositoryCriteria.java
===================================================================
RCS file:
/home/cvs/avalon/repository/impl/src/java/org/apache/avalon/repository/impl/RepositoryCriteria.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepositoryCriteria.java 5 Dec 2003 08:26:31 -0000 1.2
+++ RepositoryCriteria.java 6 Dec 2003 23:51:08 -0000 1.3
@@ -62,12 +62,13 @@
import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.provider.InitialContext;
+import org.apache.avalon.util.criteria.Criteria;
+import org.apache.avalon.util.criteria.Parameter;
+import org.apache.avalon.util.criteria.PackedParameter;
import org.apache.avalon.util.defaults.Defaults;
import org.apache.avalon.util.defaults.DefaultsFinder;
import org.apache.avalon.util.defaults.SimpleDefaultsFinder;
import org.apache.avalon.util.defaults.SystemDefaultsFinder;
-import org.apache.avalon.util.factory.impl.Criteria ;
-import org.apache.avalon.util.factory.impl.Parameter ;
/**
@@ -136,11 +137,11 @@
/**
* Repository proxy password parameter descriptor.
*/
- public static final String REPOSITORY_REMOTE_HOSTS = "avalon.repository.host";
+ public static final String REPOSITORY_REMOTE_HOSTS = "avalon.repository.hosts";
public static final Parameter REPOSITORY_REMOTE_HOSTS_PARAM =
- new Parameter(
+ new PackedParameter(
REPOSITORY_REMOTE_HOSTS,
- String[].class,
+ ",",
null );
/**
@@ -148,35 +149,27 @@
*/
public static final Parameter[] PARAMS = new Parameter[]{
REPOSITORY_CACHE_DIR_PARAM,
+ REPOSITORY_REMOTE_HOSTS_PARAM,
REPOSITORY_PROXY_HOST_PARAM,
REPOSITORY_PROXY_PORT_PARAM,
REPOSITORY_PROXY_USERNAME_PARAM,
- REPOSITORY_PROXY_PASSWORD_PARAM,
- REPOSITORY_REMOTE_HOSTS_PARAM };
+ REPOSITORY_PROXY_PASSWORD_PARAM };
/**
* The name of the static defaults property resource.
*/
- public static final String DEFAULTS = "default.properties";
+ public static final String DEFAULTS = "avalon.properties";
/**
* recognized single keys
*/
- private static final String [] SINGLE_KEYS = {
- REPOSITORY_CACHE_DIR,
- REPOSITORY_PROXY_HOST,
- REPOSITORY_PROXY_PORT,
- REPOSITORY_PROXY_USERNAME,
- REPOSITORY_PROXY_PASSWORD
- };
+ private static final String [] SINGLE_KEYS = Parameter.getKeys( PARAMS );
/**
- * regognized multivalue keys
+ * recognized multivalue keys
*/
- public static final String [] MULTI_VALUE_KEYS = {
- REPOSITORY_REMOTE_HOSTS
- };
+ public static final String [] MULTI_VALUE_KEYS = {};
//--------------------------------------------------------------
// constructor
@@ -190,13 +183,23 @@
{
super( PARAMS );
- Properties bootstrap = getDefaultProperties();
+ //
+ // setup the default values aquired from the initial context
+ //
+
+ put(
+ REPOSITORY_CACHE_DIR,
+ context.getInitialCacheDirectory() );
+ put(
+ REPOSITORY_REMOTE_HOSTS,
+ context.getInitialHosts() );
//
// Create the finder (discovery policy), construct the defaults, and
// macro expand the values.
//
+ Properties bootstrap = getDefaultProperties();
final DefaultsFinder[] finders = {
new SimpleDefaultsFinder( new Properties[] { bootstrap }, false ),
new SystemDefaultsFinder() };
@@ -211,13 +214,7 @@
String cache =
defaults.getProperty( REPOSITORY_CACHE_DIR );
- if( null == cache )
- {
- put(
- REPOSITORY_CACHE_DIR,
- context.getInitialCacheDirectory() );
- }
- else
+ if( null != cache )
{
put(
REPOSITORY_CACHE_DIR,
@@ -226,16 +223,12 @@
try
{
- String[] hosts =
- defaults.getEnumerated( REPOSITORY_REMOTE_HOSTS );
+ String hosts =
+ defaults.getProperty( REPOSITORY_REMOTE_HOSTS );
if( null != hosts )
{
put( REPOSITORY_REMOTE_HOSTS, hosts );
}
- else
- {
- put( REPOSITORY_REMOTE_HOSTS, context.getInitialHosts() );
- }
}
catch ( Throwable e )
{
@@ -271,6 +264,23 @@
defaults.getProperty( REPOSITORY_PROXY_PASSWORD ) );
}
}
+ }
+
+ private String hostList( String message, String[] hosts )
+ {
+ StringBuffer buffer = new StringBuffer( message );
+ if( null == hosts )
+ {
+ buffer.append( " (null)" );
+ return buffer.toString();
+ }
+ buffer.append( "\n" );
+ for( int i=0; i<hosts.length; i++ )
+ {
+ if( i>0 ) buffer.append( "," );
+ buffer.append( hosts[i] );
+ }
+ return buffer.toString();
}
1.1
avalon/repository/impl/src/java/org/apache/avalon/repository/impl/avalon.properties
Index: avalon.properties
===================================================================
#
# static implementation defaults
#
# Alternative root cache directory.
# Normally supplied by initial context.
#avalon.home =
1.2 +1 -6 avalon/repository/main/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/main/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 4 Dec 2003 19:34:41 -0000 1.1
+++ project.xml 6 Dec 2003 23:51:08 -0000 1.2
@@ -47,12 +47,7 @@
</dependency>
<dependency>
<groupId>avalon-util</groupId>
- <artifactId>avalon-util-factory-api</artifactId>
- <version>1.0-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-factory-impl</artifactId>
+ <artifactId>avalon-util-criteria</artifactId>
<version>1.0-dev</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
