From 8bb63d56d7c48904e311c5c38f28ed009259b13e Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Wed, 28 Feb 2007 01:56:48 +0000 Subject: [PATCH] o Going to start writing some documentation and I would like everything of use in the embedder package. I'll keep internal goodies in sub packages. git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@512559 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/embedder/{configuration => }/Configuration.java | 2 +- .../{configuration => }/ConfigurationValidationResult.java | 2 +- .../embedder/{configuration => }/DefaultConfiguration.java | 5 +---- .../DefaultConfigurationValidationResult.java | 2 +- .../main/java/org/apache/maven/embedder/MavenEmbedder.java | 6 +++--- .../DefaultMavenExecutionRequestDefaultsPopulator.java | 4 ---- .../execution/MavenExecutionRequestDefaultsPopulator.java | 1 - .../java/org/apache/maven/embedder/MavenEmbedderTest.java | 4 ++-- .../org/apache/maven/embedder/TestComponentOverride.java | 4 ++-- .../{configuration => }/ValidateConfigurationTest.java | 5 ++++- 10 files changed, 15 insertions(+), 20 deletions(-) rename maven-embedder/src/main/java/org/apache/maven/embedder/{configuration => }/Configuration.java (98%) rename maven-embedder/src/main/java/org/apache/maven/embedder/{configuration => }/ConfigurationValidationResult.java (92%) rename maven-embedder/src/main/java/org/apache/maven/embedder/{configuration => }/DefaultConfiguration.java (95%) rename maven-embedder/src/main/java/org/apache/maven/embedder/{configuration => }/DefaultConfigurationValidationResult.java (97%) rename maven-embedder/src/test/java/org/apache/maven/embedder/{configuration => }/ValidateConfigurationTest.java (91%) diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/configuration/Configuration.java b/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java similarity index 98% rename from maven-embedder/src/main/java/org/apache/maven/embedder/configuration/Configuration.java rename to maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java index b9377d78db..ca4b94ae42 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/configuration/Configuration.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/Configuration.java @@ -1,4 +1,4 @@ -package org.apache.maven.embedder.configuration; +package org.apache.maven.embedder; /* * Copyright 2001-2005 The Apache Software Foundation. * diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/configuration/ConfigurationValidationResult.java b/maven-embedder/src/main/java/org/apache/maven/embedder/ConfigurationValidationResult.java similarity index 92% rename from maven-embedder/src/main/java/org/apache/maven/embedder/configuration/ConfigurationValidationResult.java rename to maven-embedder/src/main/java/org/apache/maven/embedder/ConfigurationValidationResult.java index e1287852a7..af88a2f182 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/configuration/ConfigurationValidationResult.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/ConfigurationValidationResult.java @@ -1,4 +1,4 @@ -package org.apache.maven.embedder.configuration; +package org.apache.maven.embedder; /** @author Jason van Zyl */ public interface ConfigurationValidationResult diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/configuration/DefaultConfiguration.java b/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java similarity index 95% rename from maven-embedder/src/main/java/org/apache/maven/embedder/configuration/DefaultConfiguration.java rename to maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java index 27317e5880..04aaeb8300 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/configuration/DefaultConfiguration.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfiguration.java @@ -1,4 +1,4 @@ -package org.apache.maven.embedder.configuration; +package org.apache.maven.embedder; /* * Copyright 2001-2005 The Apache Software Foundation. * @@ -17,9 +17,6 @@ import org.apache.maven.embedder.ContainerCustomizer; import org.apache.maven.embedder.MavenEmbedderLogger; -import org.apache.maven.settings.Settings; -import org.apache.maven.settings.SettingsUtils; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.codehaus.plexus.classworlds.ClassWorld; import java.io.File; diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/configuration/DefaultConfigurationValidationResult.java b/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfigurationValidationResult.java similarity index 97% rename from maven-embedder/src/main/java/org/apache/maven/embedder/configuration/DefaultConfigurationValidationResult.java rename to maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfigurationValidationResult.java index 6aee9c7b10..4790a5d705 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/configuration/DefaultConfigurationValidationResult.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/DefaultConfigurationValidationResult.java @@ -1,4 +1,4 @@ -package org.apache.maven.embedder.configuration; +package org.apache.maven.embedder; /** @author Jason van Zyl */ public class DefaultConfigurationValidationResult diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java index 4697f306e9..13acf95dea 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java @@ -31,9 +31,9 @@ import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.context.BuildContextManager; -import org.apache.maven.embedder.configuration.Configuration; -import org.apache.maven.embedder.configuration.ConfigurationValidationResult; -import org.apache.maven.embedder.configuration.DefaultConfigurationValidationResult; +import org.apache.maven.embedder.Configuration; +import org.apache.maven.embedder.ConfigurationValidationResult; +import org.apache.maven.embedder.DefaultConfigurationValidationResult; import org.apache.maven.embedder.execution.MavenExecutionRequestDefaultsPopulator; import org.apache.maven.embedder.writer.WriterUtils; import org.apache.maven.execution.DefaultMavenExecutionResult; diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java index 4116bc5969..38b95a982b 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/DefaultMavenExecutionRequestDefaultsPopulator.java @@ -19,13 +19,10 @@ * under the License. */ -import org.apache.maven.MavenTools; import org.apache.maven.SettingsConfigurationException; import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.embedder.configuration.Configuration; import org.apache.maven.embedder.MavenEmbedderException; import org.apache.maven.embedder.MavenEmbedder; import org.apache.maven.execution.MavenExecutionRequest; @@ -47,7 +44,6 @@ import org.codehaus.plexus.logging.Logger; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; import org.codehaus.plexus.util.xml.Xpp3Dom; -import org.codehaus.plexus.util.StringUtils; import java.io.File; import java.util.Iterator; diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java index a2d17d5cfd..242c93b62b 100644 --- a/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java +++ b/maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenExecutionRequestDefaultsPopulator.java @@ -1,6 +1,5 @@ package org.apache.maven.embedder.execution; -import org.apache.maven.embedder.configuration.Configuration; import org.apache.maven.embedder.MavenEmbedderException; import org.apache.maven.embedder.MavenEmbedder; import org.apache.maven.execution.MavenExecutionRequest; diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java index 6e042e7afb..b525c57514 100644 --- a/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/embedder/MavenEmbedderTest.java @@ -1,8 +1,8 @@ package org.apache.maven.embedder; import org.apache.maven.SettingsConfigurationException; -import org.apache.maven.embedder.configuration.Configuration; -import org.apache.maven.embedder.configuration.DefaultConfiguration; +import org.apache.maven.embedder.Configuration; +import org.apache.maven.embedder.DefaultConfiguration; import org.apache.maven.artifact.handler.ArtifactHandler; import org.apache.maven.execution.DefaultMavenExecutionRequest; import org.apache.maven.execution.MavenExecutionRequest; diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java b/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java index 0f9c3bde64..ab32f318ee 100644 --- a/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java +++ b/maven-embedder/src/test/java/org/apache/maven/embedder/TestComponentOverride.java @@ -1,8 +1,8 @@ package org.apache.maven.embedder; import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.embedder.configuration.DefaultConfiguration; -import org.apache.maven.embedder.configuration.Configuration; +import org.apache.maven.embedder.DefaultConfiguration; +import org.apache.maven.embedder.Configuration; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; diff --git a/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java b/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java similarity index 91% rename from maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java rename to maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java index 2a17271223..3d98c8d490 100644 --- a/maven-embedder/src/test/java/org/apache/maven/embedder/configuration/ValidateConfigurationTest.java +++ b/maven-embedder/src/test/java/org/apache/maven/embedder/ValidateConfigurationTest.java @@ -1,7 +1,10 @@ -package org.apache.maven.embedder.configuration; +package org.apache.maven.embedder; import org.codehaus.plexus.PlexusTestCase; import org.apache.maven.embedder.MavenEmbedder; +import org.apache.maven.embedder.ConfigurationValidationResult; +import org.apache.maven.embedder.DefaultConfiguration; +import org.apache.maven.embedder.Configuration; import java.io.File;