Author: carlos
Date: Fri Jun 1 16:36:54 2007
New Revision: 543664
URL: http://svn.apache.org/viewvc?view=rev&rev=543664
Log:
[MNG-2943] Avoid using package names used in other artifacts: org.apache.maven
Added:
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
- copied, changed from r543378,
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?view=diff&rev=543664&r1=543663&r2=543664
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
Fri Jun 1 16:36:54 2007
@@ -20,7 +20,6 @@
*/
import org.apache.maven.Maven;
-import org.apache.maven.SettingsConfigurationException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.handler.ArtifactHandler;
@@ -60,6 +59,7 @@
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.SettingsConfigurationException;
import org.apache.maven.settings.io.jdom.SettingsJDOMWriter;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.apache.maven.settings.validation.DefaultSettingsValidator;
Modified:
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java?view=diff&rev=543664&r1=543663&r2=543664
==============================================================================
---
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
(original)
+++
maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
Fri Jun 1 16:36:54 2007
@@ -19,21 +19,21 @@
* under the License.
*/
-import org.apache.maven.SettingsConfigurationException;
import org.apache.maven.wagon.repository.RepositoryPermissions;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
+import org.apache.maven.core.monitor.event.DefaultEventMonitor;
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderException;
import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.monitor.event.DefaultEventMonitor;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.SettingsConfigurationException;
import org.apache.maven.usability.SystemWarnings;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
Modified:
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java?view=diff&rev=543664&r1=543663&r2=543664
==============================================================================
---
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
(original)
+++
maven/components/trunk/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
Fri Jun 1 16:36:54 2007
@@ -20,7 +20,6 @@
*/
import junit.framework.TestCase;
-import org.apache.maven.SettingsConfigurationException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
@@ -34,6 +33,7 @@
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Settings;
+import org.apache.maven.settings.SettingsConfigurationException;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
import org.codehaus.plexus.util.FileUtils;
Modified:
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java?view=diff&rev=543664&r1=543663&r2=543664
==============================================================================
---
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
(original)
+++
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
Fri Jun 1 16:36:54 2007
@@ -21,17 +21,15 @@
/**
* If there was an error in the settings file.
+ *
+ * @deprecated use [EMAIL PROTECTED]
org.apache.maven.settings.SettingsConfigurationException}
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
* @version $Id$
*/
public class SettingsConfigurationException
- extends Exception
+ extends org.apache.maven.settings.SettingsConfigurationException
{
- private int lineNumber;
-
- private int columnNumber;
-
public SettingsConfigurationException( String message )
{
super( message );
@@ -44,21 +42,7 @@
public SettingsConfigurationException( String message, Throwable cause,
int lineNumber, int columnNumber )
{
- super( message + ( lineNumber > 0 ? "\n Line: " + lineNumber : "" )
+
- ( columnNumber > 0 ? "\n Column: " + columnNumber : "" ), cause );
- this.lineNumber = lineNumber;
- this.columnNumber = columnNumber;
- }
-
- public int getColumnNumber()
- {
- return columnNumber;
- }
-
- public int getLineNumber()
- {
- return lineNumber;
+ super( message, cause, lineNumber, columnNumber );
}
-
}
Copied:
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
(from r543378,
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java)
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java?view=diff&rev=543664&p1=maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java&r1=543378&p2=maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java&r2=543664
==============================================================================
---
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
(original)
+++
maven/components/trunk/maven-settings/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java
Fri Jun 1 16:36:54 2007
@@ -1,4 +1,4 @@
-package org.apache.maven;
+package org.apache.maven.settings;
/*
* Licensed to the Apache Software Foundation (ASF) under one
