Author: evenisse
Date: Sun Jun 5 08:21:52 2005
New Revision: 180100
URL: http://svn.apache.org/viewcvs?rev=180100&view=rev
Log:
Remove plexus-i18n from core for use it in plugins, site and reports
Modified:
maven/components/trunk/maven-core/pom.xml
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Modified: maven/components/trunk/maven-core/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/pom.xml?rev=180100&r1=180099&r2=180100&view=diff
==============================================================================
--- maven/components/trunk/maven-core/pom.xml (original)
+++ maven/components/trunk/maven-core/pom.xml Sun Jun 5 08:21:52 2005
@@ -69,11 +69,6 @@
<artifactId>commons-cli</artifactId>
<version>1.0-beta-2</version>
</dependency>
- <dependency>
- <groupId>plexus</groupId>
- <artifactId>plexus-i18n</artifactId>
- <version>1.0-beta-4</version>
- </dependency>
<!-- TODO: only here for classloader issues. It used to work when the
script classes were inside the component factory... -->
<dependency>
<groupId>org.apache.maven</groupId>
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=180100&r1=180099&r2=180100&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
Sun Jun 5 08:21:52 2005
@@ -42,7 +42,6 @@
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.context.Context;
import org.codehaus.plexus.context.ContextException;
-import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
import org.codehaus.plexus.util.dag.CycleDetectedException;
@@ -68,8 +67,6 @@
// Components
// ----------------------------------------------------------------------
- private I18N i18n;
-
protected MavenProjectBuilder projectBuilder;
protected LifecycleExecutor lifecycleExecutor;
@@ -302,7 +299,7 @@
{
if ( pom.length() == 0 )
{
- throw new ProjectBuildingException( i18n.format(
"empty.descriptor.error", pom ) );
+ throw new ProjectBuildingException( "The file " +
pom.getAbsolutePath() + " you specified has zero length." );
}
}
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=180100&r1=180099&r2=180100&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Sun Jun 5 08:21:52 2005
@@ -811,7 +811,6 @@
"plexus-bsh-factory",
"plexus-container-artifact",
"plexus-container-default",
- "plexus-i18n",
"plexus-marmalade-factory",
"plexus-utils",
"wagon-provider-api"
Modified:
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=180100&r1=180099&r2=180100&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
(original)
+++
maven/components/trunk/maven-core/src/main/resources/META-INF/plexus/components.xml
Sun Jun 5 08:21:52 2005
@@ -10,9 +10,6 @@
<implementation>org.apache.maven.DefaultMaven</implementation>
<requirements>
<requirement>
- <role>org.codehaus.plexus.i18n.I18N</role>
- </requirement>
- <requirement>
<role>org.apache.maven.project.MavenProjectBuilder</role>
</requirement>
<requirement>
@@ -53,18 +50,6 @@
<role>org.apache.maven.usability.ErrorDiagnoser</role>
<role-hint>InvalidArtifactDiagnoser</role-hint>
<implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
- </component>
- <!--
- |
- |
- |
- -->
- <component>
- <role>org.codehaus.plexus.i18n.I18N</role>
- <implementation>org.codehaus.plexus.i18n.DefaultI18N</implementation>
- <configuration>
-
<default-bundle-name>org.apache.maven.messages.messages</default-bundle-name>
- </configuration>
</component>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
