You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ni...@apache.org on 2004/03/08 12:26:10 UTC
cvs commit: avalon/repository/impl project.xml
niclas 2004/03/08 03:26:10
Modified: repository/cli project.xml
repository/cli/src/java/org/apache/avalon/repository/cli
Main.java RepositoryVerifier.java
repository/impl project.xml
Log:
Slowly removing excalibur dependencies from Merlin.
Revision Changes Path
1.3 +3 -2 avalon/repository/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/cli/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 22 Feb 2004 19:10:35 -0000 1.2
+++ project.xml 8 Mar 2004 11:26:10 -0000 1.3
@@ -25,8 +25,9 @@
<version>1.0</version>
</dependency>
<dependency>
- <id>excalibur-i18n</id>
- <version>1.1</version>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-i18n</artifactId>
+ <version>1.0</version>
</dependency>
</dependencies>
1.7 +4 -4 avalon/repository/cli/src/java/org/apache/avalon/repository/cli/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/avalon/repository/cli/src/java/org/apache/avalon/repository/cli/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Main.java 24 Feb 2004 22:18:23 -0000 1.6
+++ Main.java 8 Mar 2004 11:26:10 -0000 1.7
@@ -34,9 +34,6 @@
import javax.naming.directory.Attributes;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
-
import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.provider.Builder;
import org.apache.avalon.repository.provider.InitialContext;
@@ -46,8 +43,11 @@
import org.apache.avalon.repository.main.DefaultBuilder;
import org.apache.avalon.repository.meta.ArtifactDescriptor;
import org.apache.avalon.repository.util.RepositoryUtils;
+
import org.apache.avalon.util.env.Env;
import org.apache.avalon.util.exception.ExceptionHelper;
+import org.apache.avalon.util.i18n.ResourceManager;
+import org.apache.avalon.util.i18n.Resources;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
1.4 +4 -4 avalon/repository/cli/src/java/org/apache/avalon/repository/cli/RepositoryVerifier.java
Index: RepositoryVerifier.java
===================================================================
RCS file: /home/cvs/avalon/repository/cli/src/java/org/apache/avalon/repository/cli/RepositoryVerifier.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RepositoryVerifier.java 24 Feb 2004 22:18:23 -0000 1.3
+++ RepositoryVerifier.java 8 Mar 2004 11:26:10 -0000 1.4
@@ -35,9 +35,6 @@
import javax.naming.directory.Attributes;
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
-
import org.apache.avalon.repository.Artifact;
import org.apache.avalon.repository.provider.Builder;
import org.apache.avalon.repository.provider.InitialContext;
@@ -47,8 +44,11 @@
import org.apache.avalon.repository.main.DefaultBuilder;
import org.apache.avalon.repository.meta.ArtifactDescriptor;
import org.apache.avalon.repository.util.RepositoryUtils;
+
import org.apache.avalon.util.env.Env;
import org.apache.avalon.util.exception.ExceptionHelper;
+import org.apache.avalon.util.i18n.ResourceManager;
+import org.apache.avalon.util.i18n.Resources;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
1.8 +3 -2 avalon/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/repository/impl/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 22 Feb 2004 19:10:35 -0000 1.7
+++ project.xml 8 Mar 2004 11:26:10 -0000 1.8
@@ -50,8 +50,9 @@
<version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
- <id>excalibur-i18n</id>
- <version>1.1</version>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-i18n</artifactId>
+ <version>1.0</version>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org