Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-2943] Avoid using package names used in other artifacts: org.apache.maven 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543664 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Carlos Sanchez Gonzalez 2007-06-01 23:36:54 +00:00
parent d050220b39
commit 1bd449b2f1
5 changed files with 72 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.embedder;
*/
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.MavenProjectBuilder;
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;

4
maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java
View File

@ -19,21 +19,21 @@ package org.apache.maven.embedder.execution;
* 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;

2
maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.embedder;
*/
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.project.MavenProject;
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;

24
maven-settings/src/main/java/org/apache/maven/SettingsConfigurationException.java
View File

@ -21,17 +21,15 @@ package org.apache.maven;
/**
* If there was an error in the settings file.
*
* @deprecated use {@link org.apache.maven.settings.SettingsConfigurationException}
*
* @author <a href="mailto:brett@apache.org">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 class SettingsConfigurationException
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;
super( message, cause, lineNumber, columnNumber );
}
public int getColumnNumber()
{
return columnNumber;
}
public int getLineNumber()
{
return lineNumber;
}
}

64
maven-settings/src/main/java/org/apache/maven/settings/SettingsConfigurationException.java Normal file
View File

@ -0,0 +1,64 @@
package org.apache.maven.settings;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* If there was an error in the settings file.
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
* @version $Id$
*/
public class SettingsConfigurationException
extends Exception
{
private int lineNumber;
private int columnNumber;
public SettingsConfigurationException( String message )
{
super( message );
}
public SettingsConfigurationException( String message, Throwable cause )
{
super( message, cause );
}
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;
}
}