mcconnell 2003/11/03 15:57:30
Modified: merlin platform.xml project.xml
merlin/activation/impl project.xml
merlin/activation/spi project.xml
merlin/composition/api project.xml
merlin/composition/impl project.xml
merlin/composition/spi project.xml
merlin/kernel/bootstrap project.xml
merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/impl project.xml
merlin/kernel/loader project.xml
merlin/kernel/plugin project.xml
merlin/kernel/unit project.xml
merlin/kernel/unit/src/etc merlin.properties
merlin/platform/src/etc site.jsl
merlin/repository/impl project.xml
merlin/repository/spi project.xml
merlin/repository/spi/src/java/org/apache/avalon/repository
RepositoryConfig.java repository.properties
merlin/repository/spi/src/test/org/apache/avalon/repository
RepositoryLoaderTest.java
merlin/util/defaults/src/java/org/apache/avalon/defaults
Defaults.java
Log:
Update projects defs to include dependence on repository 1.1-dev. Update repository
spi classes to enable test cases and link to dpml for statistics.
Revision Changes Path
1.9 +2 -2 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- platform.xml 3 Nov 2003 18:54:18 -0000 1.8
+++ platform.xml 3 Nov 2003 23:57:29 -0000 1.9
@@ -52,12 +52,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.7 +6 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 30 Oct 2003 01:14:15 -0000 1.6
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.7
@@ -105,15 +105,19 @@
</developer>
<developer>
<name>Aaron Far</name>
- <email>[EMAIL PROTECTED]</email>
+ <email>[EMAIL PROTECTED]</email>
+ <id>farra</id>
<roles>
<role>Testing, bug reporting, and early access trial participation.</role>
+ <role>AltRMI extensions.</role>
+ <role>JMS extensions.</role>
</roles>
<organization>Sony Electronics</organization>
</developer>
<developer>
<name>Neeme Praks</name>
<email>[EMAIL PROTECTED]</email>
+ <id>neeme</id>
<roles>
<role>Documentation improvements and corrections.</role>
</roles>
@@ -121,6 +125,7 @@
<developer>
<name>Alex Karasulu</name>
<email>[EMAIL PROTECTED]</email>
+ <id>akarasulu</id>
<roles>
<role>Kernel loading strategy, refactoring and optimization of embedded
aspects.</role>
</roles>
1.7 +2 -2 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 3 Nov 2003 06:11:30 -0000 1.6
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.7
@@ -33,12 +33,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.5 +1 -1 avalon/merlin/activation/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/spi/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 3 Nov 2003 06:11:30 -0000 1.4
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.5
@@ -24,7 +24,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.4 +1 -1 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/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:58 -0000 1.3
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.4
@@ -28,7 +28,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.4 +2 -2 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Oct 2003 06:12:58 -0000 1.3
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.4
@@ -20,12 +20,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.5 +1 -1 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 21 Oct 2003 07:23:43 -0000 1.4
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.5
@@ -28,7 +28,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.2 +2 -2 avalon/merlin/kernel/bootstrap/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 24 Sep 2003 09:32:51 -0000 1.1
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.2
@@ -21,12 +21,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
</dependencies>
1.9 +2 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- merlin.properties 3 Nov 2003 06:11:30 -0000 1.8
+++ merlin.properties 3 Nov 2003 23:57:29 -0000 1.9
@@ -21,7 +21,7 @@
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.0b1
+merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.1-dev
#
# the bootstrap classpath
@@ -32,7 +32,7 @@
merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2-dev
merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
-merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.0b1
+merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.1-dev
merlin.impl.classpath.7=commons-cli:commons-cli;1.0
merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2-dev
merlin.impl.classpath.9=logkit:logkit;1.2
1.8 +2 -2 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 3 Nov 2003 06:11:30 -0000 1.7
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.8
@@ -61,12 +61,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.5 +2 -2 avalon/merlin/kernel/loader/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/loader/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 3 Nov 2003 16:14:03 -0000 1.4
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.5
@@ -31,12 +31,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
</dependencies>
1.9 +2 -2 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 3 Nov 2003 06:11:31 -0000 1.8
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.9
@@ -100,12 +100,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.13 +2 -2 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 3 Nov 2003 06:11:31 -0000 1.12
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.13
@@ -22,12 +22,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
1.8 +2 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- merlin.properties 3 Nov 2003 06:11:31 -0000 1.7
+++ merlin.properties 3 Nov 2003 23:57:29 -0000 1.8
@@ -21,7 +21,7 @@
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.0b1
+merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.1-dev
#
# the bootstrap classpath
@@ -32,7 +32,7 @@
merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2-dev
merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
-merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.0b1
+merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.1-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.9=logkit:logkit;1.2
1.4 +2 -0 avalon/merlin/platform/src/etc/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/etc/site.jsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- site.jsl 28 Oct 2003 14:42:40 -0000 1.3
+++ site.jsl 3 Nov 2003 23:57:29 -0000 1.4
@@ -291,6 +291,7 @@
</j:if>
</j:if>
</j:if>
+ <!--
<j:set var="devProcess" value="false"/>
<util:available file="${maven.docs.src}/development-process.xml">
<j:set var="devProcess" value="true"/>
@@ -310,6 +311,7 @@
</small>
</div>
</j:if>
+ -->
</div>
</j:if>
1.3 +2 -2 avalon/merlin/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/repository/impl/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 3 Nov 2003 06:53:16 -0000 1.2
+++ project.xml 3 Nov 2003 23:57:29 -0000 1.3
@@ -8,7 +8,7 @@
<id>avalon-repository-impl</id>
<name>Avalon Repository Implementation</name>
<package>org.apache.avalon.repository</package>
- <currentVersion>1.0b1</currentVersion>
+ <currentVersion>1.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Jar file repository implementation.</shortDescription>
@@ -17,7 +17,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
+ <version>1.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
1.3 +1 -9 avalon/merlin/repository/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/repository/spi/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 3 Nov 2003 06:35:41 -0000 1.2
+++ project.xml 3 Nov 2003 23:57:30 -0000 1.3
@@ -7,20 +7,12 @@
<groupId>avalon-repository</groupId>
<id>avalon-repository-spi</id>
<name>Avalon Repository SPI</name>
- <currentVersion>1.0b1</currentVersion>
+ <currentVersion>1.1-dev</currentVersion>
<package>org.apache.avalon.repository</package>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Repository SPI</shortDescription>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- </dependency>
- </dependencies>
<build>
1.4 +6 -6
avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryConfig.java
Index: RepositoryConfig.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryConfig.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RepositoryConfig.java 3 Nov 2003 22:03:54 -0000 1.3
+++ RepositoryConfig.java 3 Nov 2003 23:57:30 -0000 1.4
@@ -121,16 +121,16 @@
/**
* Sets the remote repository urls for downloading artifacts.
*
- * @param a_remoteRepositoryUrls the remote Repositories to use.
+ * @param urls the remote Repositories to use.
*/
- public void setRemoteRepositoryUrls( String[] a_remoteRepositories )
+ public void setRemoteRepositoryUrls( String[] urls )
throws MalformedURLException
{
- URL [] a_urls = new URL [a_remoteRepositories.length] ;
+ URL [] a_urls = new URL [urls.length] ;
for ( int ii = 0; ii < a_urls.length; ii++ )
{
- a_urls[ii] = new URL( a_remoteRepositories[ii] ) ;
+ a_urls[ii] = new URL( urls[ii] ) ;
}
1.5 +5 -4
avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/repository.properties
Index: repository.properties
===================================================================
RCS file:
/home/cvs/avalon/merlin/repository/spi/src/java/org/apache/avalon/repository/repository.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- repository.properties 3 Nov 2003 22:03:54 -0000 1.4
+++ repository.properties 3 Nov 2003 23:57:30 -0000 1.5
@@ -2,11 +2,12 @@
factory=org.apache.avalon.repository.impl.DefaultFactory
-remote.repository.url.0=http://ibiblio.org/maven
+remote.repository.url.0=http://dpml.net
+remote.repository.url.1=http://ibiblio.org/maven
-url.1=http://ibiblio.org/maven/avalon-repository/jars/avalon-repository-impl-SNAPSHOT.jar
+url.1=http://dpml.net/avalon-repository/jars/avalon-repository-impl-1.1-dev.jar
-url.2=http://ibiblio.org/maven/avalon-util/jars/avalon-util-defaults-1.0-dev.jar
+url.2=http://dpml.net/avalon-util/jars/avalon-util-defaults-1.0-dev.jar
-url.3=http://ibiblio.org/maven/avalon-util/jars/avalon-util-env-1.0-dev.jar
+url.3=http://dpml.net/avalon-util/jars/avalon-util-env-1.0-dev.jar
1.3 +7 -9
avalon/merlin/repository/spi/src/test/org/apache/avalon/repository/RepositoryLoaderTest.java
Index: RepositoryLoaderTest.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/repository/spi/src/test/org/apache/avalon/repository/RepositoryLoaderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RepositoryLoaderTest.java 3 Nov 2003 06:49:51 -0000 1.2
+++ RepositoryLoaderTest.java 3 Nov 2003 23:57:30 -0000 1.3
@@ -92,20 +92,18 @@
super(arg0);
}
-
public void testRepositoryLoader() throws Exception
{
- //RepositoryLoader l_loader = new RepositoryLoader() ;
- //assertNotNull( l_loader ) ;
-
+ RepositoryLoader l_loader = new RepositoryLoader() ;
+ assertNotNull( l_loader ) ;
}
public void testGetDefaultConfig() throws Exception
{
- //RepositoryLoader l_loader = new RepositoryLoader() ;
- //assertNotNull( l_loader ) ;
- //RepositoryConfig l_config = l_loader.getDefaultConfig() ;
- //assertNotNull( l_config ) ;
+ RepositoryLoader l_loader = new RepositoryLoader() ;
+ assertNotNull( l_loader ) ;
+ RepositoryConfig l_config = l_loader.getDefaultConfig() ;
+ assertNotNull( l_config ) ;
}
public void testGetTempFile()
1.2 +3 -3
avalon/merlin/util/defaults/src/java/org/apache/avalon/defaults/Defaults.java
Index: Defaults.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/util/defaults/src/java/org/apache/avalon/defaults/Defaults.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Defaults.java 2 Nov 2003 16:59:38 -0000 1.1
+++ Defaults.java 3 Nov 2003 23:57:30 -0000 1.2
@@ -264,7 +264,7 @@
* time the property is discovered or continuing on to take the last value
* found for the property key.
*
- * @param a_key a property key
+ * @param l_key a property key
* @param a_sources a set of source Properties
* @param a_haltOnDiscovery true if we stop on finding a value, false
* otherwise
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
