mcconnell 2004/01/20 19:24:33
Modified:
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultSystemContext.java
merlin/kernel/cli project.xml
merlin/kernel/impl project.xml
merlin/kernel/plugin project.xml
merlin/kernel/servlet project.xml
merlin/kernel/unit project.xml
repository/impl project.xml
repository/main project.xml
repository platform.xml
repository/spi/src/java/org/apache/avalon/repository/provider
CacheManager.java
repository/test project.xml
util/defaults project.xml
util/env project.xml
util/plugin project.xml
util project.xml
Log:
Housekeeping including version bumps derived from util bump.
Revision Changes Path
1.10 +9 -7
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultSystemContext.java 19 Jan 2004 21:46:10 -0000 1.9
+++ DefaultSystemContext.java 21 Jan 2004 03:24:32 -0000 1.10
@@ -59,6 +59,7 @@
import org.apache.avalon.composition.logging.impl.DefaultLoggingManager;
import org.apache.avalon.composition.model.ModelFactory;
import org.apache.avalon.composition.model.SystemContext;
+import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.data.CategoryDirective;
import org.apache.avalon.repository.Repository;
@@ -114,15 +115,14 @@
Logger logger = logging.getLoggerForCategory( "" );
CacheManager cache = createCacheManager( root );
Repository repository = cache.createRepository();
- //final File working = new File( System.getProperty( "user.dir" ),
"working" );
- //final File home = new File( working, "home" );
- //final File temp = new File( working, "temp" );
Parameters parameters = null;
if( secure )
{
parameters = new Parameters();
- parameters.setParameter( "urn:composition:security.enabled", "true" );
+ parameters.setParameter(
+ ContainmentModel.SECURE_EXECUTION_KEY,
+ "true" );
}
final File home = new File( base, "home" );
final File temp = new File( base, "temp" );
@@ -136,7 +136,8 @@
{
String dpml = "http://dpml.net";;
String ibiblio = "http://www.ibiblio.org/maven";;
- return new DefaultCacheManager( root, null, new String[]{ dpml, ibiblio } );
+ return new DefaultCacheManager(
+ root, null, new String[]{ dpml, ibiblio } );
}
private static LoggingManager createLoggingManager(
@@ -236,7 +237,8 @@
*/
public DefaultSystemContext(
LoggingManager logging, File base, File home, File temp,
- Repository repository, String category, boolean trace, Parameters params )
+ Repository repository, String category, boolean trace,
+ Parameters params )
{
if( base == null )
{
1.6 +1 -1 avalon/merlin/kernel/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 13 Jan 2004 11:41:27 -0000 1.5
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.6
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<id>commons-cli</id>
1.18 +1 -1 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 13 Jan 2004 11:41:27 -0000 1.17
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.18
@@ -150,7 +150,7 @@
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-env</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
1.18 +1 -1 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- project.xml 13 Jan 2004 11:41:28 -0000 1.17
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.18
@@ -16,7 +16,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
<properties>
<classloader>root</classloader>
</properties>
1.5 +1 -1 avalon/merlin/kernel/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 13 Jan 2004 11:41:28 -0000 1.4
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.5
@@ -75,7 +75,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
1.23 +1 -1 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.xml 13 Jan 2004 11:41:28 -0000 1.22
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.23
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
1.4 +2 -2 avalon/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 18 Dec 2003 01:10:14 -0000 1.3
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.4
@@ -8,7 +8,7 @@
<id>avalon-repository-impl</id>
<name>Avalon Repository Implementation</name>
<package>org.apache.avalon.repository</package>
- <currentVersion>1.2</currentVersion>
+ <currentVersion>1.3-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Jar file repository implementation.</shortDescription>
@@ -47,7 +47,7 @@
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-env</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<id>excalibur-i18n</id>
1.4 +3 -3 avalon/repository/main/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/main/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 18 Dec 2003 01:10:14 -0000 1.3
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.4
@@ -7,7 +7,7 @@
<groupId>avalon-repository</groupId>
<id>avalon-repository-main</id>
<name>Avalon Repository Bootstap</name>
- <currentVersion>1.2</currentVersion>
+ <currentVersion>1.3-SNAPSHOT</currentVersion>
<package>org.apache.avalon.repository</package>
@@ -33,12 +33,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-env</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
1.4 +1 -1 avalon/repository/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/repository/platform.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- platform.xml 18 Dec 2003 01:10:13 -0000 1.3
+++ platform.xml 21 Jan 2004 03:24:32 -0000 1.4
@@ -12,7 +12,7 @@
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-env</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>avalon-util</groupId>
1.3 +3 -3
avalon/repository/spi/src/java/org/apache/avalon/repository/provider/CacheManager.java
Index: CacheManager.java
===================================================================
RCS file:
/home/cvs/avalon/repository/spi/src/java/org/apache/avalon/repository/provider/CacheManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CacheManager.java 7 Dec 2003 03:15:16 -0000 1.2
+++ CacheManager.java 21 Jan 2004 03:24:32 -0000 1.3
@@ -70,8 +70,8 @@
*
* @return the cache directory
*/
- File getCacheDirectory() ;
-
+ File getCacheDirectory();
+
/**
* Install a block archive into the repository.
* @param url the block archive url
1.3 +1 -1 avalon/repository/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/test/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 18 Dec 2003 01:10:14 -0000 1.2
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.3
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
- <version>1.2</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
</dependencies>
1.4 +2 -2 avalon/util/defaults/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/defaults/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 18 Dec 2003 01:09:57 -0000 1.3
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.4
@@ -7,7 +7,7 @@
<groupId>avalon-util</groupId>
<id>avalon-util-defaults</id>
<name>Avalon Property Defaults</name>
- <currentVersion>1.1</currentVersion>
+ <currentVersion>1.2-SNAPSHOT</currentVersion>
<package>org.apache.avalon.util.defaults</package>
@@ -19,7 +19,7 @@
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-env</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
</dependencies>
1.5 +1 -1 avalon/util/env/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/env/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 21 Jan 2004 01:17:15 -0000 1.4
+++ project.xml 21 Jan 2004 03:24:32 -0000 1.5
@@ -7,7 +7,7 @@
<groupId>avalon-util</groupId>
<id>avalon-util-env</id>
<name>Avalon Environment Utilities</name>
- <currentVersion>1.1-DEV</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<package>org.apache.avalon.util.env</package>
1.4 +1 -1 avalon/util/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/plugin/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 18 Dec 2003 01:09:58 -0000 1.3
+++ project.xml 21 Jan 2004 03:24:33 -0000 1.4
@@ -6,7 +6,7 @@
<groupId>avalon-util</groupId>
<id>avalon-plugin</id>
<name>Avalon Plugin</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<description>Avalon Plugin for Maven</description>
<shortDescription>Avalon Plugin</shortDescription>
<package>org.apache.avalon</package>
1.9 +1 -1 avalon/util/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/util/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 26 Dec 2003 09:19:05 -0000 1.8
+++ project.xml 21 Jan 2004 03:24:33 -0000 1.9
@@ -7,7 +7,7 @@
<name>Avalon Utilities</name>
<package>org.apache.avalon.util</package>
<shortDescription>Avalon Utilities</shortDescription>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.1-SNAPSHOT</currentVersion>
<organization>
<name>Apache Software Foundation</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
