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/03 20:04:54 UTC
cvs commit: avalon/merlin/platform/src/bin/nt wrapper.conf
mcconnell 2003/12/03 11:04:54
Modified: merlin maven.xml platform.xml
merlin/activation/api project.xml
merlin/activation/impl project.xml
merlin/activation/spi project.xml
merlin/composition/api project.xml
merlin/composition/impl project.xml
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultClassLoaderModel.java
DefaultContainmentModel.java
DefaultSystemContext.java
merlin/composition/spi project.xml
merlin/kernel/bootstrap maven.xml project.xml
merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/bootstrap/src/java Merlin.java
merlin/kernel/impl project.xml
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel
KernelContext.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
CLIKernelLoader.java DefaultKernel.java
DefaultKernelContext.java
merlin/kernel/plugin project.xml
merlin/kernel/spi project.xml
merlin/kernel/unit project.xml
merlin/kernel/unit/src/etc merlin.properties
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
DefaultEmbeddedKernel.java
merlin/platform/src/bin merlin-server.sh merlin.bat
merlin.sh merlinx.bat merlinx.sh
merlin/platform/src/bin/nt wrapper.conf
Log:
Synchronize all subsystems to repository 1.2-dev.
Revision Changes Path
1.11 +1 -5 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- maven.xml 23 Nov 2003 14:30:20 -0000 1.10
+++ maven.xml 3 Dec 2003 19:04:53 -0000 1.11
@@ -2,7 +2,7 @@
<maven:snapshot project="${pom}"/>
- <ant:property name="merlin.bootstrap.jar" value="merlin-bootstrap-1.0.jar"/>
+ <ant:property name="merlin.bootstrap.jar" value="merlin-bootstrap-1.1.jar"/>
<ant:property name="merlin.plugin.jar" value="merlin-plugin-1.1-SNAPSHOT.jar"/>
<ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.2.jar"/>
<ant:property name="repository.plugin.jar"
@@ -343,10 +343,6 @@
<j:forEach var="packageGroup" items="${pom.packageGroups}">
<group title="${packageGroup.title}" packages="${packageGroup.packages}"/>
</j:forEach>
- <sourcepath path="${basedir}/util/env/src/java"/>
- <sourcepath path="${basedir}/util/defaults/src/java"/>
- <sourcepath path="${basedir}/repository/spi/src/java"/>
- <sourcepath path="${basedir}/repository/impl/src/java"/>
<sourcepath path="${basedir}/extension/spi/src/java"/>
<sourcepath path="${basedir}/extension/impl/src/java"/>
<sourcepath path="${basedir}/composition/api/src/java"/>
1.13 +35 -10 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- platform.xml 28 Nov 2003 11:58:46 -0000 1.12
+++ platform.xml 3 Dec 2003 19:04:53 -0000 1.13
@@ -28,12 +28,12 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-spi</artifactId>
- <version>3.2-dev</version>
+ <version>3.2.1-dev</version>
</dependency>
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-impl</artifactId>
- <version>3.2.1-dev</version>
+ <version>3.2.2-dev</version>
</dependency>
<!-- avalon dependecies -->
@@ -48,16 +48,41 @@
<artifactId>avalon-util-defaults</artifactId>
<version>1.1-dev</version>
</dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-exception</artifactId>
+ <version>1.0-dev</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>
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-util</artifactId>
+ <version>1.2-dev</version>
</dependency>
<dependency>
@@ -100,33 +125,33 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.3-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
1.4 +2 -2 avalon/merlin/activation/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Oct 2003 06:12:57 -0000 1.3
+++ project.xml 3 Dec 2003 19:04:53 -0000 1.4
@@ -8,7 +8,7 @@
<id>avalon-activation-api</id>
<name>Avalon Activation API</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation API</shortDescription>
@@ -32,7 +32,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
</dependencies>
1.9 +18 -8 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 22 Nov 2003 12:52:55 -0000 1.8
+++ project.xml 3 Dec 2003 19:04:53 -0000 1.9
@@ -8,7 +8,7 @@
<id>avalon-activation-impl</id>
<name>Avalon Activation Framework</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.2-dev</currentVersion>
+ <currentVersion>1.2.3-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Runtime activation framework.</shortDescription>
@@ -32,40 +32,50 @@
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-util</artifactId>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
1.6 +4 -4 avalon/merlin/activation/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/spi/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 3 Nov 2003 23:57:29 -0000 1.5
+++ project.xml 3 Dec 2003 19:04:53 -0000 1.6
@@ -8,7 +8,7 @@
<id>avalon-activation-spi</id>
<name>Avalon Activation SPI</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.1-dev</currentVersion>
+ <currentVersion>1.2.2-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation Service Provider Interface</shortDescription>
@@ -23,8 +23,8 @@
<dependency>
<groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
</dependency>
<dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
1.6 +3 -3 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 4 Nov 2003 00:43:06 -0000 1.5
+++ project.xml 3 Dec 2003 19:04:53 -0000 1.6
@@ -8,7 +8,7 @@
<id>avalon-composition-api</id>
<name>Avalon Composition API</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition SPI</shortDescription>
@@ -27,8 +27,8 @@
<dependency>
<groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
</dependency>
<dependency>
1.6 +13 -3 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 22 Nov 2003 12:52:55 -0000 1.5
+++ project.xml 3 Dec 2003 19:04:53 -0000 1.6
@@ -8,7 +8,7 @@
<id>avalon-composition-impl</id>
<name>Avalon Composition Framework</name>
<package>org.apache.avalon.composition</package>
- <currentVersion>1.2.1-dev</currentVersion>
+ <currentVersion>1.2.2-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition Framework.</shortDescription>
@@ -19,13 +19,23 @@
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-util</artifactId>
+ <version>1.2-dev</version>
</dependency>
<dependency>
1.3 +15 -4 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java
Index: DefaultClassLoaderModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultClassLoaderModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultClassLoaderModel.java 28 Oct 2003 20:21:00 -0000 1.2
+++ DefaultClassLoaderModel.java 3 Dec 2003 19:04:53 -0000 1.3
@@ -71,6 +71,7 @@
import org.apache.avalon.composition.model.ServiceRepository;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.util.StringHelper;
+import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.Repository;
import org.apache.avalon.extension.Extension;
import org.apache.avalon.extension.manager.ExtensionManager;
@@ -439,7 +440,9 @@
{
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "repository declarations: " + repositories.length );
+ getLogger().debug(
+ "repository declarations: "
+ + repositories.length );
}
}
@@ -448,7 +451,10 @@
ResourceDirective[] resources = repositories[i].getResources();
if( getLogger().isDebugEnabled() )
{
- getLogger().debug( "repository " + i + " contains " + resources.length + " entries." );
+ getLogger().debug( "repository " + i
+ + " contains "
+ + resources.length
+ + " entries." );
}
for( int j=0; j<resources.length; j++ )
@@ -458,7 +464,12 @@
String version = resource.getVersion();
if( resource.getType().equals( "jar" ) )
{
- URL url = repository.getArtifact( id, version, "jar" );
+ URL url = repository.getResource(
+ Artifact.createArtifact(
+ resource.getGroup(),
+ resource.getName(),
+ resource.getVersion(),
+ resource.getType() ) );
classpath.add( url.toString() );
}
}
1.7 +7 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultContainmentModel.java 22 Nov 2003 12:52:55 -0000 1.6
+++ DefaultContainmentModel.java 3 Dec 2003 19:04:53 -0000 1.7
@@ -87,6 +87,7 @@
import org.apache.avalon.composition.logging.LoggingManager;
import org.apache.avalon.composition.util.StringHelper;
import org.apache.avalon.repository.Repository;
+import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.configuration.Configuration;
@@ -499,6 +500,8 @@
final String name = directive.getName();
final ResourceDirective resource = directive.getResource();
final String id = resource.getId();
+ final String group = resource.getGroup();
+ final String resourceName = resource.getName();
final String version = resource.getVersion();
final String type = resource.getType();
@@ -506,7 +509,9 @@
try
{
Repository repository = m_context.getSystemContext().getRepository();
- final URL url = repository.getArtifact( id, version, type );
+ Artifact artifact =
+ Artifact.createArtifact( group, resourceName, version, type );
+ final URL url = repository.getResource( artifact );
model = createContainmentModel( name, url );
}
catch( RepositoryException e )
1.3 +10 -11 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
Index: DefaultSystemContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultSystemContext.java 28 Oct 2003 20:21:00 -0000 1.2
+++ DefaultSystemContext.java 3 Dec 2003 19:04:53 -0000 1.3
@@ -60,7 +60,9 @@
import org.apache.avalon.composition.model.ModelFactory;
import org.apache.avalon.composition.model.SystemContext;
import org.apache.avalon.repository.Repository;
-import org.apache.avalon.repository.impl.DefaultFileRepository;
+import org.apache.avalon.repository.provider.CacheManager;
+import org.apache.avalon.repository.impl.DefaultCacheManager;
+import org.apache.avalon.repository.impl.DefaultRepository;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.logger.ConsoleLogger;
import org.apache.avalon.excalibur.i18n.ResourceManager;
@@ -110,8 +112,12 @@
private static Repository createRepository( File root ) throws Exception
{
- URL ibiblio = new URL( "http://www.ibiblio.org/maven" );
- return new DefaultFileRepository( root, new URL[]{ ibiblio } );
+ String dpml = "http://dpml.net";
+ String ibiblio = "http://www.ibiblio.org/maven";
+ CacheManager manager = new DefaultCacheManager( root, null );
+ return new DefaultRepository(
+ manager,
+ new String[]{ dpml, ibiblio } );
}
private static LoggingManager createLoggingManager( File base, int priority ) throws Exception
@@ -309,14 +315,7 @@
*/
public ClassLoader getCommonClassLoader()
{
- //
- // TODO: setup proper handling of classloader management, but
- // the meantime, return the system classloader in place of the
- // api classloader
- //
-
return m_common;
- //return getSystemClassLoader();
}
/**
1.7 +2 -8 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 4 Nov 2003 00:49:16 -0000 1.6
+++ project.xml 3 Dec 2003 19:04:53 -0000 1.7
@@ -8,7 +8,7 @@
<id>avalon-composition-spi</id>
<name>Avalon Composition SPI</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition SPI</shortDescription>
@@ -26,12 +26,6 @@
</dependency>
<dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
- </dependency>
-
- <dependency>
<groupId>avalon-extension</groupId>
<artifactId>avalon-extension-spi</artifactId>
<version>1.0</version>
@@ -40,7 +34,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
</dependencies>
1.3 +4 -4 avalon/merlin/kernel/bootstrap/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 4 Nov 2003 04:05:06 -0000 1.2
+++ maven.xml 3 Dec 2003 19:04:53 -0000 1.3
@@ -9,10 +9,10 @@
<ant:echo file="${basedir}/snapshot.properties">
build.signature = ${snapshotSignature}
</ant:echo>
- <unzip src="${pom.getDependencyPath('avalon-repository:avalon-repository-spi')}"
- dest="${maven.build.dir}/classes"/>
- <unzip src="${pom.getDependencyPath('avalon-repository:avalon-repository-impl')}"
- dest="${maven.build.dir}/classes"/>
+ <j:forEach var="dep" items="${pom.dependencies}">
+ <unzip src="${pom.getDependencyPath( dep.getId() )}"
+ dest="${maven.build.dir}/classes"/>
+ </j:forEach>
</preGoal>
<goal name="build" prereqs="jar:install">
1.3 +8 -3 avalon/merlin/kernel/bootstrap/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 3 Nov 2003 23:57:29 -0000 1.2
+++ project.xml 3 Dec 2003 19:04:53 -0000 1.3
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-bootstrap</id>
<name>Merlin Kernel CLI</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1</currentVersion>
<package>*</package>
<inceptionYear>2003</inceptionYear>
@@ -20,12 +20,17 @@
<dependency>
<groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <artifactId>avalon-repository-main</artifactId>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-defaults</artifactId>
<version>1.1-dev</version>
</dependency>
1.12 +16 -10 avalon/merlin/kernel/bootstrap/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/src/etc/merlin.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- merlin.properties 22 Nov 2003 12:52:55 -0000 1.11
+++ merlin.properties 3 Dec 2003 19:04:53 -0000 1.12
@@ -9,19 +9,21 @@
#
merlin.api.classpath.0=avalon-framework:avalon-framework-api;4.1.5
merlin.api.classpath.1=avalon-meta:avalon-meta-api;1.2.1-dev
-merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.2-dev
-merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.2-dev
+merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.2.1-dev
+merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.2.1-dev
merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
merlin.api.classpath.5=avalon-extension:avalon-extension-spi;1.0
-merlin.api.classpath.6=merlin:merlin-kernel-spi;3.2-dev
+merlin.api.classpath.6=merlin:merlin-kernel-spi;3.2.1-dev
+merlin.api.classpath.7=avalon-repository:avalon-repository-api;1.2-dev
#
# the spi classpath
#
merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.2.1-dev
-merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.2-dev
-merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2.1-dev
-merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.1-dev
+merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.2.1-dev
+merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2.2-dev
+merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.2-dev
+merlin.api.classpath.4=avalon-util:avalon-util-factory-api;1.0-dev
#
# the bootstrap classpath
@@ -29,14 +31,18 @@
merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;4.1.5
merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.2.1-dev
merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0
-merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2.1-dev
-merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
+merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2.2-dev
+merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.3-dev
merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
-merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.1-dev
+merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.2-dev
+merlin.impl.classpath.6=avalon-repository:avalon-repository-util;1.2-dev
merlin.impl.classpath.7=commons-cli:commons-cli;1.0
-merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2.1-dev
+merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2.2-dev
merlin.impl.classpath.9=logkit:logkit;1.2
merlin.impl.classpath.10=excalibur-event:excalibur-event;1.0.3
merlin.impl.classpath.11=excalibur-configuration:excalibur-configuration;1.1
merlin.impl.classpath.12=mx4j:mx4j-jmx;1.1.1
merlin.impl.classpath.13=mx4j:mx4j-tools;1.1.1
+merlin.impl.classpath.14=avalon-util:avalon-util-factory-impl;1.0-dev
+merlin.impl.classpath.15=avalon-util:avalon-util-defaults;1.1-dev
+merlin.impl.classpath.16=avalon-util:avalon-util-env;1.0-dev
1.4 +14 -8 avalon/merlin/kernel/bootstrap/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/src/java/Merlin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Merlin.java 28 Oct 2003 20:21:01 -0000 1.3
+++ Merlin.java 3 Dec 2003 19:04:53 -0000 1.4
@@ -58,8 +58,11 @@
import java.util.Properties;
import java.util.StringTokenizer;
+import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.Repository;
-import org.apache.avalon.repository.impl.DefaultFileRepository;
+import org.apache.avalon.repository.provider.CacheManager;
+import org.apache.avalon.repository.impl.DefaultRepository;
+import org.apache.avalon.repository.impl.DefaultCacheManager;
/**
* Merlin commandline bootstrap handler.
@@ -155,8 +158,9 @@
System.out.println( "system remote repositories: " + remotePath );
}
- URL[] remote = getRemoteURLs( remotePath );
- repository = new DefaultFileRepository( base, null, remote );
+ String[] remote = getRemoteURLs( remotePath );
+ CacheManager cache = new DefaultCacheManager( base, null );
+ repository = new DefaultRepository( cache, remote );
//
// get the set of URLs for the bootstrap classloader from the
@@ -297,16 +301,16 @@
}
}
- private static URL[] getRemoteURLs( String path ) throws Exception
+ private static String[] getRemoteURLs( String path ) throws Exception
{
ArrayList list = new ArrayList();
StringTokenizer tokenizer = new StringTokenizer( path, "," );
while( tokenizer.hasMoreElements() )
{
String token = tokenizer.nextToken();
- list.add( new URL( token ) );
+ list.add( token );
}
- return (URL[]) list.toArray( new URL[0] );
+ return (String[]) list.toArray( new String[0] );
}
/**
@@ -377,8 +381,10 @@
{
artifact = item.substring( n+1, item.length() );
}
-
- return repository.getArtifact( group, artifact, version, "jar" );
+
+ Artifact ref = Artifact.createArtifact( group, artifact, version );
+
+ return repository.getResource( ref );
}
catch( Throwable e )
{
1.11 +50 -11 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 28 Nov 2003 11:58:47 -0000 1.10
+++ project.xml 3 Dec 2003 19:04:53 -0000 1.11
@@ -9,7 +9,7 @@
<name>Merlin Kernel Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.1-dev</currentVersion>
+ <currentVersion>3.2.2-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Kernel Implementation</shortDescription>
@@ -37,7 +37,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-spi</artifactId>
- <version>3.2-dev</version>
+ <version>3.2.1-dev</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -48,7 +48,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -56,7 +56,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -64,13 +64,29 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.3-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ <properties>
+ <avalon.classloader>api</avalon.classloader>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
+ <properties>
+ <avalon.classloader>spi</avalon.classloader>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-factory-api</artifactId>
+ <version>1.0-dev</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -78,13 +94,38 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-util</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-defaults</artifactId>
<version>1.1-dev</version>
</dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-env</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-exception</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-factory-impl</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -92,7 +133,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -100,7 +141,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
@@ -198,8 +239,6 @@
<!-- commons dependencies -->
- <!--
- -->
<dependency>
<id>commons-cli</id>
<version>1.0</version>
1.3 +7 -0 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/KernelContext.java
Index: KernelContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/KernelContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KernelContext.java 28 Oct 2003 20:21:01 -0000 1.2
+++ KernelContext.java 3 Dec 2003 19:04:53 -0000 1.3
@@ -6,6 +6,7 @@
import java.net.URL;
import org.apache.avalon.repository.Repository;
+import org.apache.avalon.repository.provider.CacheManager;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.logging.LoggingManager;
@@ -30,6 +31,12 @@
* @return the repository
*/
Repository getRepository();
+
+ /**
+ * Return the cache manager
+ * @return the cache manager
+ */
+ CacheManager getCacheManager();
/**
* Return the home path
1.3 +2 -2 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/CLIKernelLoader.java
Index: CLIKernelLoader.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/CLIKernelLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CLIKernelLoader.java 28 Oct 2003 20:21:01 -0000 1.2
+++ CLIKernelLoader.java 3 Dec 2003 19:04:53 -0000 1.3
@@ -24,7 +24,7 @@
import org.apache.avalon.merlin.kernel.KernelException;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
-import org.apache.avalon.repository.BlockManifest;
+import org.apache.avalon.repository.provider.BlockManifest;
import org.apache.avalon.repository.Repository;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
@@ -160,7 +160,7 @@
URL url = resolveURL( path );
log.info( "installing: " + url );
StringBuffer buffer = new StringBuffer();
- BlockManifest manifest = context.getRepository().install( url, buffer );
+ BlockManifest manifest = context.getCacheManager().install( url, buffer );
log.info( buffer.toString() );
return;
}
1.8 +2 -2 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultKernel.java 3 Nov 2003 06:11:30 -0000 1.7
+++ DefaultKernel.java 3 Dec 2003 19:04:53 -0000 1.8
@@ -317,7 +317,7 @@
*/
public String getRepositoryDirectoryPath()
{
- return m_context.getRepository().getLocation();
+ return m_context.getRepository().toString();
}
/**
1.5 +28 -25 avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
Index: DefaultKernelContext.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultKernelContext.java 28 Oct 2003 20:21:01 -0000 1.4
+++ DefaultKernelContext.java 3 Dec 2003 19:04:53 -0000 1.5
@@ -82,10 +82,13 @@
import org.apache.avalon.merlin.kernel.KernelContext;
import org.apache.avalon.merlin.kernel.KernelException;
import org.apache.avalon.merlin.kernel.KernelRuntimeException;
+import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.Repository;
-import org.apache.avalon.repository.ProxyContext;
+import org.apache.avalon.repository.provider.CacheManager;
+import org.apache.avalon.repository.impl.DefaultCacheManager;
+import org.apache.avalon.repository.impl.ProxyContext;
import org.apache.avalon.repository.impl.DefaultAuthenticator;
-import org.apache.avalon.repository.impl.DefaultFileRepository;
+import org.apache.avalon.repository.impl.DefaultRepository;
import org.apache.excalibur.configuration.ConfigurationUtil;
import org.apache.excalibur.mpool.PoolManager;
@@ -202,6 +205,8 @@
private final String m_bootstrap;
+ private CacheManager m_cacheManager;
+
//--------------------------------------------------------------
// constructor
//--------------------------------------------------------------
@@ -229,7 +234,7 @@
{
if( bootstrap == null ) throw new NullPointerException( "bootstrap" );
- m_bootstrap = bootstrap.getLocation();
+ m_bootstrap = bootstrap.toString();
m_temp = new File( System.getProperty( "java.io.tmpdir" ) );
final File base = new File( System.getProperty( "user.dir" ) );
@@ -370,7 +375,7 @@
Configuration repositoryConfig = kernelConfig.getChild( "repository" );
m_repository = createRepository( m_user, repositoryConfig );
- getLogger().debug( "repository established: " + m_repository.getLocation() );
+ getLogger().debug( "repository established: " + m_repository.toString() );
//
// if the debug flag is enabled then print the context object
@@ -455,7 +460,7 @@
//
final Configuration[] hosts = config.getChild( "hosts" ).getChildren( "host" );
- final URL[] list = new URL[ hosts.length ];
+ final String[] list = new String[ hosts.length ];
for( int i=0; i<hosts.length; i++ )
{
Configuration host = hosts[i];
@@ -487,22 +492,7 @@
throw new KernelException( error );
}
}
- if( !path.endsWith( "/" ) )
- {
- path = path + "/";
- }
- URL url = new URL( path );
- final String protocol = url.getProtocol();
- if( url.getProtocol().equals( "http" ) )
- {
- list[i] = url;
- }
- else
- {
- final String error =
- "Unsupported protocol: " + protocol;
- throw new KernelException( error );
- }
+ list[i] = path;
}
catch( Throwable e )
{
@@ -558,7 +548,9 @@
proxy = new ProxyContext( host, port, authenticator );
}
- return new DefaultFileRepository( base, proxy, list );
+ // nasty hack to - but this is going to be replaced anyway
+ m_cacheManager = new DefaultCacheManager( base, proxy );
+ return new DefaultRepository( m_cacheManager, list );
}
//--------------------------------------------------------------
@@ -603,6 +595,16 @@
}
/**
+ * Return the cache manager
+ * @return the cache manager
+ */
+ public CacheManager getCacheManager()
+ {
+ return m_cacheManager;
+ }
+
+
+ /**
* Return the library path
* @return the path (possibly null)
*/
@@ -727,7 +729,7 @@
+ System.getProperty( "java.version" ) );
buffer.append( "\n Deployment Home: " + StringHelper.toString( getHomePath() ) );
buffer.append( "\n System Repository: " + getBootstrapRepositoryPath() );
- buffer.append( "\n Runtime Repository: " + getRepository().getLocation() );
+ buffer.append( "\n Runtime Repository: " + getRepository() );
buffer.append( "\n Library Anchor: " + StringHelper.toString( getLibraryPath() ) );
buffer.append( "\n Kernel Path: " + StringHelper.toString( m_kernelURL ) );
buffer.append( "\n Deployment Blocks: " + StringHelper.toString( m_blocks ) );
@@ -928,7 +930,8 @@
private URL loadKernelDirective( Repository repository ) throws Exception
{
- return repository.getArtifact( "merlin", "kernel", "", "xml" );
+ Artifact artifact = Artifact.createArtifact( "merlin", "kernel", null, "xml" );
+ return repository.getResource( artifact );
}
/**
1.11 +45 -9 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 22 Nov 2003 12:52:55 -0000 1.10
+++ project.xml 3 Dec 2003 19:04:54 -0000 1.11
@@ -30,44 +30,44 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-spi</artifactId>
- <version>3.2-dev</version>
+ <version>3.2.1-dev</version>
</dependency>
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-impl</artifactId>
- <version>3.2.1-dev</version>
+ <version>3.2.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.3-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
@@ -99,13 +99,49 @@
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-util</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-env</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-defaults</artifactId>
<version>1.1-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-exception</artifactId>
+ <version>1.0-dev</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>
<dependency>
1.7 +3 -3 avalon/merlin/kernel/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/spi/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 19 Oct 2003 06:12:59 -0000 1.6
+++ project.xml 3 Dec 2003 19:04:54 -0000 1.7
@@ -9,7 +9,7 @@
<name>Merlin Kernel SPI</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2-dev</currentVersion>
+ <currentVersion>3.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Kernel SPI</shortDescription>
<description>
@@ -27,13 +27,13 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
</dependencies>
1.14 +37 -2 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- project.xml 3 Nov 2003 23:57:29 -0000 1.13
+++ project.xml 3 Dec 2003 19:04:54 -0000 1.14
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit</name>
- <currentVersion>3.2.3-dev</currentVersion>
+ <currentVersion>3.2.4-dev</currentVersion>
<package>org.apache.avalon.merlin.unit</package>
<inceptionYear>2003</inceptionYear>
@@ -21,13 +21,48 @@
<dependency>
<groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-api</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.1-dev</version>
+ <version>1.2-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-repository</groupId>
+ <artifactId>avalon-repository-util</artifactId>
+ <version>1.2-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-env</artifactId>
+ <version>1.0-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-defaults</artifactId>
<version>1.1-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-exception</artifactId>
+ <version>1.0-dev</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>
<dependency>
1.10 +16 -10 avalon/merlin/kernel/unit/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/src/etc/merlin.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- merlin.properties 22 Nov 2003 12:52:55 -0000 1.9
+++ merlin.properties 3 Dec 2003 19:04:54 -0000 1.10
@@ -9,19 +9,21 @@
#
merlin.api.classpath.0=avalon-framework:avalon-framework-api;4.1.5
merlin.api.classpath.1=avalon-meta:avalon-meta-api;1.2.1-dev
-merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.2-dev
-merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.2-dev
+merlin.api.classpath.2=avalon-composition:avalon-composition-api;1.2.1-dev
+merlin.api.classpath.3=avalon-activation:avalon-activation-api;1.2.1-dev
merlin.api.classpath.4=excalibur-lifecycle:excalibur-lifecycle-api;1.0
merlin.api.classpath.5=avalon-extension:avalon-extension-spi;1.0
-merlin.api.classpath.6=merlin:merlin-kernel-spi;3.2-dev
+merlin.api.classpath.6=merlin:merlin-kernel-spi;3.2.1-dev
+merlin.api.classpath.7=avalon-repository:avalon-repository-api;1.2-dev
#
# the spi classpath
#
merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.2.1-dev
-merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.2-dev
-merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2.1-dev
-merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.1-dev
+merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.2.1-dev
+merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2.2-dev
+merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.2-dev
+merlin.api.classpath.4=avalon-util:avalon-util-factory-api;1.0-dev
#
# the bootstrap classpath
@@ -29,15 +31,19 @@
merlin.impl.classpath.0=avalon-framework:avalon-framework-impl;4.1.5
merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.2.1-dev
merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0
-merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2.1-dev
-merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
+merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2.2-dev
+merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.3-dev
merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
-merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.1-dev
+merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.2-dev
+merlin.impl.classpath.6=avalon-repository:avalon-repository-util;1.2-dev
merlin.impl.classpath.7=commons-cli:commons-cli;1.0
-merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2.1-dev
+merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2.2-dev
merlin.impl.classpath.9=logkit:logkit;1.2
merlin.impl.classpath.10=excalibur-event:excalibur-event;1.0.3
merlin.impl.classpath.11=excalibur-configuration:excalibur-configuration;1.1
merlin.impl.classpath.12=mx4j:mx4j-jmx;1.1.1
merlin.impl.classpath.13=mx4j:mx4j-tools;1.1.1
+merlin.impl.classpath.14=avalon-util:avalon-util-factory-impl;1.0-dev
+merlin.impl.classpath.15=avalon-util:avalon-util-defaults;1.1-dev
+merlin.impl.classpath.16=avalon-util:avalon-util-env;1.0-dev
1.6 +16 -26 avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/DefaultEmbeddedKernel.java
Index: DefaultEmbeddedKernel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/DefaultEmbeddedKernel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultEmbeddedKernel.java 13 Nov 2003 01:56:42 -0000 1.5
+++ DefaultEmbeddedKernel.java 3 Dec 2003 19:04:54 -0000 1.6
@@ -65,9 +65,12 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.merlin.kernel.Kernel;
import org.apache.avalon.merlin.kernel.KernelException;
+import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.Repository;
-import org.apache.avalon.repository.ProxyContext;
-import org.apache.avalon.repository.impl.DefaultFileRepository;
+import org.apache.avalon.repository.provider.CacheManager;
+import org.apache.avalon.repository.impl.ProxyContext;
+import org.apache.avalon.repository.impl.DefaultCacheManager;
+import org.apache.avalon.repository.impl.DefaultRepository;
import org.apache.avalon.repository.impl.DefaultAuthenticator;
/**
@@ -101,24 +104,9 @@
private static final String CONTINUE = "continue";
private static final String EXIT = "exit";
- private static final URL DPML = createURL( "http://dpml.net/" );
- private static final URL IBIBLIO = createURL( "http://www.ibiblio.org/maven/" );
- private static final URL[] DEFAULT_REMOTE_URLS = new URL[]{ DPML, IBIBLIO };
-
- private static URL createURL( String path )
- {
- try
- {
- return new URL( path );
- }
- catch( Throwable e )
- {
- // will not happen
- final String error =
- "Unexpect error while building url: " + path;
- throw new UnitRuntimeException( error, e );
- }
- }
+ private static final String DPML = "http://dpml.net/";
+ private static final String IBIBLIO = "http://www.ibiblio.org/maven/";
+ private static final String[] DEFAULT_REMOTE_URLS = new String[]{ DPML, IBIBLIO };
//--------------------------------------------------------
// state
@@ -457,8 +445,9 @@
{
File repo = getSystemRepositoryDirectory();
ProxyContext proxy = createProxyContext();
- URL[] hosts = createHostsSequence();
- return new DefaultFileRepository( repo, proxy, hosts );
+ CacheManager manager = new DefaultCacheManager( repo, proxy );
+ String[] hosts = createHostsSequence();
+ return new DefaultRepository( manager, hosts );
}
catch( Throwable e )
{
@@ -472,7 +461,7 @@
* Return an array of hosts based on the maven.repo.remote property value.
* @return the array of remote hosts
*/
- private URL[] createHostsSequence() throws Exception
+ private String[] createHostsSequence() throws Exception
{
ArrayList list = new ArrayList();
String path = System.getProperty( "maven.repo.remote" );
@@ -485,9 +474,9 @@
while( tokenizer.hasMoreElements() )
{
String token = tokenizer.nextToken();
- list.add( new URL( token ) );
+ list.add( token );
}
- return (URL[]) list.toArray( new URL[0] );
+ return (String[]) list.toArray( new String[0] );
}
/**
@@ -619,7 +608,8 @@
artifact = item.substring( n+1, item.length() );
}
- return repository.getArtifact( group, artifact, version, "jar" );
+ Artifact ref = Artifact.createArtifact( group, artifact, version );
+ return repository.getResource( ref );
}
catch( Throwable e )
{
1.2 +1 -1 avalon/merlin/platform/src/bin/merlin-server.sh
Index: merlin-server.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin-server.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin-server.sh 24 Sep 2003 09:33:23 -0000 1.1
+++ merlin-server.sh 3 Dec 2003 19:04:54 -0000 1.2
@@ -113,7 +113,7 @@
JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy -Djava.ext.dirs=$JVM_EXT_DIRS"
# Get the run cmd
-RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -Dmerlin.home=$MERLIN_HOME -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar $*"
+RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -Dmerlin.home=$MERLIN_HOME -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.1.jar $*"
echo "Using MERLIN_HOME: $MERLIN_HOME"
echo "Using JAVA_HOME: $JAVA_HOME"
1.2 +1 -1 avalon/merlin/platform/src/bin/merlin.bat
Index: merlin.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin.bat 24 Sep 2003 09:33:23 -0000 1.1
+++ merlin.bat 3 Dec 2003 19:04:54 -0000 1.2
@@ -3,7 +3,7 @@
:MerlinRuntime
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.0.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.1.jar
set MERLIN_EXT_DIR=%MERLIN_HOME%\ext
java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy -Dmerlin.home=%MERLIN_HOME% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
goto EndOfScript
1.2 +1 -1 avalon/merlin/platform/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin.sh 24 Sep 2003 09:33:23 -0000 1.1
+++ merlin.sh 3 Dec 2003 19:04:54 -0000 1.2
@@ -20,6 +20,6 @@
exit 1
fi
-RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME -Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar $*"
+RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME -Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.1.jar $*"
echo "RUN CMD IS: $RUN_CMD"
exec $RUN_CMD
1.2 +1 -1 avalon/merlin/platform/src/bin/merlinx.bat
Index: merlinx.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlinx.bat 24 Sep 2003 09:33:23 -0000 1.1
+++ merlinx.bat 3 Dec 2003 19:04:54 -0000 1.2
@@ -13,7 +13,7 @@
:DoneMerlinUser
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.0.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-bootstrap-1.1.jar
set MERLIN_EXT_DIR=%MERLIN_HOME%\ext
java -Djava.security.policy=%MERLIN_HOME%\bin\security.policy -Dmerlin.home=%MERLIN_HOME% -Dmerlin.system.repository=%MERLIN_SYSTEM_REPOSITORY% -Dmerlin.local.repository=%MERLIN_USER_REPOSITORY% -Djava.ext.dirs=%MERLIN_EXT_DIR% -jar %MERLIN_BOOTSTRAP_JAR% %MERLIN_CMD_LINE_ARGS%
goto :EndOfScript
1.2 +1 -1 avalon/merlin/platform/src/bin/merlinx.sh
Index: merlinx.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlinx.sh 24 Sep 2003 09:33:23 -0000 1.1
+++ merlinx.sh 3 Dec 2003 19:04:54 -0000 1.2
@@ -28,6 +28,6 @@
REPOSITORY="$MAVEN_HOME_LOCAL/repository"
fi
-RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME -Dmerlin.system.repository=$REPOSITORY -Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.0.jar $*"
+RUN_CMD="$JAVA_HOME/bin/java -Djava.security.policy=$MERLIN_HOME/bin/security.policy -Dmerlin.home=$MERLIN_HOME -Dmerlin.system.repository=$REPOSITORY -Djava.ext.dirs=$MERLIN_HOME/ext -jar $MERLIN_HOME/bin/lib/merlin-bootstrap-1.1.jar $*"
echo "RUN CMD IS: $RUN_CMD"
exec $RUN_CMD
1.3 +1 -1 avalon/merlin/platform/src/bin/nt/wrapper.conf
Index: wrapper.conf
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/nt/wrapper.conf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wrapper.conf 19 Oct 2003 06:34:52 -0000 1.2
+++ wrapper.conf 3 Dec 2003 19:04:54 -0000 1.3
@@ -10,7 +10,7 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=wrapper.jar
-wrapper.java.classpath.2=../lib/merlin-bootstrap-1.0.jar
+wrapper.java.classpath.2=../lib/merlin-bootstrap-1.1.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org